January 2020 - Wine-devel - list.winehq.org

[PATCH 1/4] dwrite: Add support for dlng/slng metadata.
by Nikolay Sivov 26 Jan '20

26 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 6 +- dlls/dwrite/main.c | 11 ++- dlls/dwrite/opentype.c | 149 +++++++++++++++++++++++++++++++++-- 4 files changed, 152 insertions(+), 16 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 6adba28280..e5ca5306c2 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -231,7 +231,7 @@ struct dwrite_fontface FONTSIGNATURE fontsig; UINT32 glyph_image_formats; - IDWriteLocalizedStrings *info_strings[DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME + 1]; + IDWriteLocalizedStrings *info_strings[DWRITE_INFORMATIONAL_STRING_SUPPORTED_SCRIPT_LANGUAGE_TAG + 1]; IDWriteLocalizedStrings *family_names; IDWriteLocalizedStrings *names; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8bcbe11fcb..847070816b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -82,7 +82,7 @@ struct dwrite_font_data struct dwrite_font_propvec propvec; DWRITE_FONT_METRICS1 metrics; - IDWriteLocalizedStrings *info_strings[DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME + 1]; + IDWriteLocalizedStrings *info_strings[DWRITE_INFORMATIONAL_STRING_SUPPORTED_SCRIPT_LANGUAGE_TAG + 1]; IDWriteLocalizedStrings *family_names; IDWriteLocalizedStrings *names; @@ -1291,8 +1291,8 @@ static HRESULT get_font_info_strings(const struct file_stream_desc *stream_desc, *exists = FALSE; *ret = NULL; - if (stringid > DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME - || stringid == DWRITE_INFORMATIONAL_STRING_NONE) + if (stringid > DWRITE_INFORMATIONAL_STRING_SUPPORTED_SCRIPT_LANGUAGE_TAG + || stringid <= DWRITE_INFORMATIONAL_STRING_NONE) { return S_OK; } diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 283cccb76c..b940d0d801 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -446,10 +446,13 @@ HRESULT add_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *locale, struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); size_t i, count = strings->count; - /* make sure there's no duplicates */ - for (i = 0; i < count; i++) - if (!strcmpW(strings->data[i].locale, locale)) - return S_OK; + /* Make sure there's no duplicates, unless it's empty. This is used by dlng/slng entries of 'meta' table. */ + if (*locale) + { + for (i = 0; i < count; i++) + if (!strcmpW(strings->data[i].locale, locale)) + return S_OK; + } if (!dwrite_array_reserve((void **)&strings->data, &strings->size, strings->count + 1, sizeof(*strings->data))) return E_OUTOFMEMORY; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index fd420e4360..23d7669eb6 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -46,6 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define MS_MAXP_TAG DWRITE_MAKE_OPENTYPE_TAG('m','a','x','p') #define MS_CBLC_TAG DWRITE_MAKE_OPENTYPE_TAG('C','B','L','C') #define MS_CMAP_TAG DWRITE_MAKE_OPENTYPE_TAG('c','m','a','p') +#define MS_META_TAG DWRITE_MAKE_OPENTYPE_TAG('m','e','t','a') /* 'sbix' formats */ #define MS_PNG__TAG DWRITE_MAKE_OPENTYPE_TAG('p','n','g',' ') @@ -55,6 +56,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define MS_WOFF_TAG DWRITE_MAKE_OPENTYPE_TAG('w','O','F','F') #define MS_WOF2_TAG DWRITE_MAKE_OPENTYPE_TAG('w','O','F','2') +/* 'meta' tags */ +#define MS_DLNG_TAG DWRITE_MAKE_OPENTYPE_TAG('d','l','n','g') +#define MS_SLNG_TAG DWRITE_MAKE_OPENTYPE_TAG('s','l','n','g') + #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) #define GET_BE_DWORD(x) (x) @@ -1164,6 +1169,22 @@ struct colr_layer_record USHORT palette_index; }; +struct meta_data_map +{ + DWORD tag; + DWORD offset; + DWORD length; +}; + +struct meta_header +{ + DWORD version; + DWORD flags; + DWORD reserved; + DWORD data_maps_count; + struct meta_data_map maps[1]; +}; + static const void *table_read_ensure(const struct dwrite_fonttable *table, unsigned int offset, unsigned int size) { if (size > table->size || offset > table->size - size) @@ -2109,23 +2130,135 @@ static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OP return exists ? S_OK : E_FAIL; } -/* Provides a conversion from DWRITE to OpenType name ids, input id should be valid, it's not checked. */ -HRESULT opentype_get_font_info_strings(const struct file_stream_desc *stream_desc, DWRITE_INFORMATIONAL_STRING_ID id, - IDWriteLocalizedStrings **strings) +static WCHAR *meta_get_lng_name(WCHAR *str, WCHAR **ctx) { - struct dwrite_fonttable name; + static const WCHAR delimW[] = {',',' ',0}; + WCHAR *ret; + + if (!str) str = *ctx; + while (*str && strchrW(delimW, *str)) str++; + if (!*str) return NULL; + ret = str++; + while (*str && !strchrW(delimW, *str)) str++; + if (*str) *str++ = 0; + *ctx = str; + + return ret; +} + +static HRESULT opentype_get_font_strings_from_meta(const struct file_stream_desc *stream_desc, + DWRITE_INFORMATIONAL_STRING_ID id, IDWriteLocalizedStrings **ret) +{ + static const WCHAR emptyW[] = { 0 }; + const struct meta_data_map *maps; + IDWriteLocalizedStrings *strings; + struct dwrite_fonttable meta; + DWORD version, i, count, tag; HRESULT hr; - opentype_get_font_table(stream_desc, MS_NAME_TAG, &name); + *ret = NULL; - hr = opentype_get_font_strings_from_id(name.data, dwriteid_to_opentypeid[id], strings); + hr = create_localizedstrings(&strings); + if (FAILED(hr)) + return hr; - if (name.context) - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, name.context); + switch (id) + { + case DWRITE_INFORMATIONAL_STRING_DESIGN_SCRIPT_LANGUAGE_TAG: + tag = MS_DLNG_TAG; + break; + case DWRITE_INFORMATIONAL_STRING_SUPPORTED_SCRIPT_LANGUAGE_TAG: + tag = MS_SLNG_TAG; + break; + default: + WARN("Unexpected id %d.\n", id); + return S_OK; + } + + opentype_get_font_table(stream_desc, MS_META_TAG, &meta); + + if (meta.data) + { + version = table_read_be_dword(&meta, 0); + if (version != 1) + { + WARN("Unexpected meta table version %d.\n", version); + goto end; + } + + count = table_read_be_dword(&meta, FIELD_OFFSET(struct meta_header, data_maps_count)); + if (!(maps = table_read_ensure(&meta, FIELD_OFFSET(struct meta_header, maps), + count * sizeof(struct meta_data_map)))) + goto end; + + for (i = 0; i < count; ++i) + { + const char *data; + + if (maps[i].tag == tag && maps[i].length) + { + DWORD length = GET_BE_DWORD(maps[i].length), j; + + if ((data = table_read_ensure(&meta, GET_BE_DWORD(maps[i].offset), length))) + { + WCHAR *ptrW = heap_alloc((length + 1) * sizeof(WCHAR)), *ctx, *token; + + if (!ptrW) + { + hr = E_OUTOFMEMORY; + goto end; + } + + /* Data is stored in comma separated list, ASCII range only. */ + for (j = 0; j < length; ++j) + ptrW[j] = data[j]; + ptrW[length] = 0; + + token = meta_get_lng_name(ptrW, &ctx); + + while (token) + { + add_localizedstring(strings, emptyW, token); + token = meta_get_lng_name(NULL, &ctx); + } + + heap_free(ptrW); + } + } + } +end: + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, meta.context); + } + + if (IDWriteLocalizedStrings_GetCount(strings)) + *ret = strings; + else + IDWriteLocalizedStrings_Release(strings); return hr; } +HRESULT opentype_get_font_info_strings(const struct file_stream_desc *stream_desc, DWRITE_INFORMATIONAL_STRING_ID id, + IDWriteLocalizedStrings **strings) +{ + struct dwrite_fonttable name; + + switch (id) + { + case DWRITE_INFORMATIONAL_STRING_DESIGN_SCRIPT_LANGUAGE_TAG: + case DWRITE_INFORMATIONAL_STRING_SUPPORTED_SCRIPT_LANGUAGE_TAG: + opentype_get_font_strings_from_meta(stream_desc, id, strings); + break; + default: + opentype_get_font_table(stream_desc, MS_NAME_TAG, &name); + opentype_get_font_strings_from_id(name.data, dwriteid_to_opentypeid[id], strings); + if (name.context) + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, name.context); + } + + return S_OK; +} + /* FamilyName locating order is WWS Family Name -> Preferred Family Name -> Family Name. If font claims to have 'Preferred Family Name' in WWS format, then WWS name is not used. */ HRESULT opentype_get_font_familyname(struct file_stream_desc *stream_desc, IDWriteLocalizedStrings **names) -- 2.24.1

1 3

[PATCH] mf: Simplify clock notification handling.
by Nikolay Sivov 26 Jan '20

26 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 7a49401d83..1f790a6ed3 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1976,6 +1976,13 @@ static HRESULT clock_change_state(struct presentation_clock *clock, enum clock_c /* CLOCK_CMD_PAUSE */ MFCLOCK_STATE_PAUSED, /* CLOCK_CMD_SET_RATE */ 0, /* Unused */ }; + static const enum clock_notification notifications[CLOCK_CMD_MAX] = + { + /* CLOCK_CMD_START */ CLOCK_NOTIFY_START, + /* CLOCK_CMD_STOP */ CLOCK_NOTIFY_STOP, + /* CLOCK_CMD_PAUSE */ CLOCK_NOTIFY_PAUSE, + /* CLOCK_CMD_SET_RATE */ CLOCK_NOTIFY_SET_RATE, + }; enum clock_notification notification; struct clock_sink *sink; IUnknown *notify_object; @@ -1994,26 +2001,13 @@ static HRESULT clock_change_state(struct presentation_clock *clock, enum clock_c system_time = MFGetSystemTime(); - switch (command) + if (command == CLOCK_CMD_START && clock->state == MFCLOCK_STATE_PAUSED && + param.u.offset == PRESENTATION_CURRENT_POSITION) { - case CLOCK_CMD_START: - if (clock->state == MFCLOCK_STATE_PAUSED && param.u.offset == PRESENTATION_CURRENT_POSITION) - notification = CLOCK_NOTIFY_RESTART; - else - notification = CLOCK_NOTIFY_START; - break; - case CLOCK_CMD_STOP: - notification = CLOCK_NOTIFY_STOP; - break; - case CLOCK_CMD_PAUSE: - notification = CLOCK_NOTIFY_PAUSE; - break; - case CLOCK_CMD_SET_RATE: - notification = CLOCK_NOTIFY_SET_RATE; - break; - default: - ; + notification = CLOCK_NOTIFY_RESTART; } + else + notification = notifications[command]; if (FAILED(hr = clock_call_state_change(system_time, param, notification, clock->time_source_sink))) return hr; -- 2.24.1

1 0

[PATCH] testbot: Return log access errors in the BadLog field for ParseWineTestRepor().
by Francois Gouget 26 Jan '20

26 Jan '20

This makes diagnosis easier for the ParseWineTestRepor() callers and matches ParseTaskLog(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/UpdateTaskLogs | 5 +---- testbot/bin/WineRunTask.pl | 6 +++--- testbot/bin/WineRunWineTest.pl | 6 +++--- testbot/lib/WineTestBot/LogUtils.pm | 5 ++++- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 00a6f23223..f5205f23d8 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -191,10 +191,7 @@ sub BuildErrFile($$$$) my $TaskKey = Path2TaskKey($Dir); my $LogInfo = ParseWineTestReport("$Dir/$ReportName", $IsWineTest, $TaskTimedOut); - if (!defined $LogInfo->{Failures} and @{$LogInfo->{Extra}} == 1) - { - return "$TaskKey: $LogInfo->{Extra}->[0]"; - } + return "$TaskKey: $LogInfo->{BadLog}" if (defined $LogInfo->{BadLog}); return undef if (!@{$LogInfo->{Extra}}); Debug("$TaskKey: Creating $ReportName.err\n"); diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 3044cd76bd..7c8c5704fe 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -558,12 +558,12 @@ if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) my $LogInfo = ParseWineTestReport("$TaskDir/$RptFileName", $IsWineTest, $TaskTimedOut); $TaskTimedOut = 1 if ($LogInfo->{TestUnitCount} == $LogInfo->{TimeoutCount}); - if (!defined $LogInfo->{Failures} and @{$LogInfo->{Extra}} == 1) + if (defined $LogInfo->{BadLog}) { # Could not open the file $NewStatus = 'boterror'; - Error "$LogInfo->{Extra}->[0]\n"; - LogTaskError("$LogInfo->{Extra}->[0]\n"); + Error "$LogInfo->{BadLog}\n"; + LogTaskError("$LogInfo->{BadLog}\n"); } else { diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 696e27e7a8..6ca1d284fe 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -580,12 +580,12 @@ foreach my $Mission (@{$TaskMissions->{Missions}}) my $LogInfo = ParseWineTestReport("$TaskDir/$RptFileName", $Step->FileType eq "patch", $TaskTimedOut); $TaskTimedOut = 1 if ($LogInfo->{TestUnitCount} == $LogInfo->{TimeoutCount}); - if (!defined $LogInfo->{Failures} and @{$LogInfo->{Extra}} == 1) + if (defined $LogInfo->{BadLog}) { # Could not open the file $NewStatus = 'boterror'; - Error "$LogInfo->{Extra}->[0]\n"; - LogTaskError("$LogInfo->{Extra}->[0]\n"); + Error "$LogInfo->{BadLog}\n"; + LogTaskError("$LogInfo->{BadLog}\n"); } else { diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 96840eba58..9aa2e81c70 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -353,6 +353,9 @@ The number of failed tests. =item Extra An array containing the extra errors detected during the inconsistency check. +=item BadLog +Contains an error message if the report could not be read. + =back =back =cut @@ -365,7 +368,7 @@ sub ParseWineTestReport($$$) if (!open($LogFile, "<", $FileName)) { my $LogName = basename($FileName); - return {Extra => ["Unable to open '$LogName' for reading: $!"]}; + return {BadLog => "Unable to open '$LogName' for reading: $!"}; } my $LogInfo = { -- 2.20.1

1 0

[PATCH] testbot/LogUtils: Rename the ParseTaskLog() NoLog error field to BadLog.
by Francois Gouget 26 Jan '20

26 Jan '20

The log file may exist but not be readable. This makes it consistent with the BadRef / NoRef terminology of TagNewErrors(). Also don't assume that the error message will evaluate to true. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 4 ++-- testbot/bin/WineRunReconfig.pl | 4 ++-- testbot/bin/WineRunWineTest.pl | 4 ++-- testbot/lib/WineTestBot/LogUtils.pm | 5 +++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index cf6428ae4a..9fc5bffe24 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -433,9 +433,9 @@ if ($TA->GetFile("Build.log", "$TaskDir/log")) $NewStatus = "badpatch"; $TAError = $ErrMessage = undef; } - elsif ($LogInfo->{NoLog}) + elsif (defined $LogInfo->{BadLog}) { - FatalError("$LogInfo->{NoLog}\n", "retry"); + FatalError("$LogInfo->{BadLog}\n", "retry"); } else { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index c16c40a5af..f56d64ae55 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -428,9 +428,9 @@ if ($TA->GetFile("Reconfig.log", "$TaskDir/log")) $NewStatus = "completed"; $TAError = $ErrMessage = undef; } - elsif ($LogInfo->{NoLog}) + elsif (defined $LogInfo->{BadLog}) { - FatalError("$LogInfo->{NoLog}\n", "retry"); + FatalError("$LogInfo->{BadLog}\n", "retry"); } else { diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 950661b70c..696e27e7a8 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -542,9 +542,9 @@ if ($TA->GetFile("Task.log", "$TaskDir/log")) $NewStatus = "badpatch"; $TaskFailures = $TAError = $ErrMessage = $PossibleCrash = undef; } - elsif ($LogInfo->{NoLog}) + elsif (defined $LogInfo->{BadLog}) { - FatalError("$LogInfo->{NoLog}\n", "retry"); + FatalError("$LogInfo->{BadLog}\n", "retry"); } elsif ($LogInfo->{Type} eq "build") { diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 81cff51af8..96840eba58 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -81,7 +81,7 @@ Either 'ok' if the task was successful or a code indicating why it failed. Entries named after the binaries and files of interest to the TestBot that have been updated. -=item NoLog +=item BadLog Contains an error message if the task log could not be read. =back @@ -95,7 +95,8 @@ sub ParseTaskLog($) my $LogFile; if (!open($LogFile, "<", $FileName)) { - return {NoLog => "Unable to open the task log for reading: $!"}; + my $LogName = basename($FileName); + return {BadLog => "Unable to open '$LogName' for reading: $!"}; } my $LogInfo = {Type => "build"}; -- 2.20.1

1 0

[PATCH] testbot/LogUtils: Better report log access errors.
by Francois Gouget 26 Jan '20

26 Jan '20

GetLogErrors() now sets $LogInfo->{BadLog} when it fails to open a log file. This makes it easier for the caller to identify the issue and report it. Similarly TagNewErrors() sets $LogInfo->{BadRef} when it cannot access the reference log. Furthermore TagNewErrors() also sets $LogInfo->{NoRef} when no reference log could be used to detect new errors, either because the reference log could not be accessed or because there was no reference log in the first place. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 2 +- testbot/lib/WineTestBot/LogUtils.pm | 33 +++++++++++++++++++++-------- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index fdf7e24092..44d7255e71 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -295,7 +295,7 @@ EOF my $AllNew; my $RefReportPath = $StepTask->GetFullFileName($StepTask->GetRefReportName($LogName)); TagNewErrors($RefReportPath, $LogInfo); - if (!defined $LogInfo->{NewCount}) + if ($LogInfo->{NoRef}) { # Test reports should have reference WineTest results and if not # reporting the errors as new would cause false positives. diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index d05a811d5c..81cff51af8 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -730,6 +730,9 @@ per dll / program being tested). Returns a hashtable containing: =over +=item BadLog +Contains an error message if the log could not be read. + =item ErrCount The number of errors. This is undefined if no log file was found. @@ -800,8 +803,9 @@ sub GetLogErrors($) } elsif (-f $LogFileName) { + $LogInfo->{BadLog} = "Could not open '". basename($LogFileName) ."' for reading: $!"; my $Group = _AddLogGroup($LogInfo, "TestBot errors"); - _AddLogError($LogInfo, $Group, "Could not open '". basename($LogFileName) ."' for reading: $!"); + _AddLogError($LogInfo, $Group, $LogInfo->{BadLog}); } if (open(my $LogFile, "<", "$LogFileName.err")) @@ -825,8 +829,9 @@ sub GetLogErrors($) } elsif (-f "$LogFileName.err") { + $LogInfo->{BadLog} ||= "Could not open '". basename($LogFileName) .".err' for reading: $!"; my $Group = _AddLogGroup($LogInfo, "TestBot errors"); - _AddLogError($LogInfo, $Group, "Could not open '". basename($LogFileName) .".err' for reading: $!"); + _AddLogError($LogInfo, $Group, $LogInfo->{BadLog}); } return $LogInfo; @@ -899,8 +904,16 @@ Compares the specified errors to the reference report to identify new errors. The $LogInfo structure is augmented with the following fields: =over +=item BadRef +Contains an error message if the reference log could not be read. + +=item NoRef +True if there was no usable reference log. This could either mean that there +was no reference log or that the reference log could not be read in which case +BadRef would be set. + =item NewCount -The total number of new errors or undef if the reference log could not be read. +The total number of new errors if any. =item ErrGroups =over @@ -922,16 +935,18 @@ sub TagNewErrors($$) { my ($RefLogPath, $LogInfo) = @_; - if (!$LogInfo->{ErrCount}) + return if (!$LogInfo->{ErrCount}); + + my $RefInfo = GetLogErrors($RefLogPath); + if (defined $RefInfo->{BadLog}) { - $LogInfo->{NewCount} = 0; + # Save the BadLog error but do not tag the errors as new: this is up to + # the caller. + $LogInfo->{BadRef} = $RefInfo->{BadLog} if (-e $RefLogPath); + $LogInfo->{NoRef} = 1; return; } - my $RefInfo = GetLogErrors($RefLogPath); - # Don't tag the errors as new if there is no reference log - return if (!defined $RefInfo->{ErrCount}); - $LogInfo->{NewCount} = 0; foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { -- 2.20.1

1 0

[PATCH resend] iphlpapi: Use res_getservers() if available to get the DNS server list.
by Chip Davis 26 Jan '20

26 Jan '20

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- configure.ac | 15 +++++++++++++ dlls/iphlpapi/iphlpapi_main.c | 42 +++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/configure.ac b/configure.ac index b40c3f0e39b5..5ae95ec94783 100644 --- a/configure.ac +++ b/configure.ac @@ -1530,6 +1530,21 @@ then AC_DEFINE(HAVE_RESOLV, 1) AC_SUBST(RESOLV_LIBS,$ac_cv_have_resolv) ;; esac + + if test "x$ac_cv_have_resolv" != "xnot found" + then + AC_CACHE_CHECK([for res_getservers],wine_cv_have_res_getservers, + [ac_save_LIBS="$LIBS" + test "x$ac_cv_have_resolv" = "xnone required" || \ + LIBS="$ac_cv_have_resolv $LIBS" + AC_LINK_IFELSE([AC_LANG_PROGRAM( + [[#include <resolv.h>]],[[res_getservers(NULL, NULL, 0);]])],[wine_cv_have_res_getservers=yes],[wine_cv_have_res_getservers=no]) + LIBS="$ac_save_LIBS"]) + if test "$wine_cv_have_res_getservers" = "yes" + then + AC_DEFINE(HAVE_RES_GETSERVERS, 1, [Define to 1 if you have the `res_getservers' function.]) + fi + fi fi dnl **** Check for LittleCMS *** diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 8c7c9018c484..f90879e05236 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1281,6 +1281,47 @@ static void initialise_resolver(void) LeaveCriticalSection(&res_init_cs); } +#ifdef HAVE_RES_GETSERVERS +static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) +{ + struct __res_state *state = &_res; + int i, found = 0, total; + SOCKADDR_STORAGE *addr = servers; + union res_sockaddr_union *buf; + + initialise_resolver(); + + total = res_getservers( state, NULL, 0 ); + + if ((!servers || !num) && !ip4_only) return total; + + buf = HeapAlloc( GetProcessHeap(), 0, total * sizeof(union res_sockaddr_union) ); + total = res_getservers( state, buf, total ); + + for (i = 0; i < total; i++) + { + if (buf[i].sin6.sin6_family == AF_INET6 && ip4_only) continue; + if (buf[i].sin.sin_family != AF_INET && buf[i].sin6.sin6_family != AF_INET6) continue; + + found++; + if (!servers || !num) continue; + + if (buf[i].sin6.sin6_family == AF_INET6) + { + sockaddr_in6_to_WS_storage( addr, &buf[i].sin6 ); + } + else + { + sockaddr_in_to_WS_storage( addr, &buf[i].sin ); + } + if (++addr >= servers + num) break; + } + + HeapFree( GetProcessHeap(), 0, buf ); + return found; +} +#else + static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) { int i, ip6_count = 0; @@ -1316,6 +1357,7 @@ static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) } return addr - servers; } +#endif #elif defined(HAVE___RES_GET_STATE) && defined(HAVE___RES_GETSERVERS) static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) -- 2.24.0

1 0

[PATCH resend] setupapi: Implement CM_Get_DevNode_Property[_Ex]W().
by Chip Davis 26 Jan '20

26 Jan '20

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/cfgmgr32/cfgmgr32.spec | 2 + dlls/setupapi/devinst.c | 105 ++++++++++++++++++++++++++---------- dlls/setupapi/setupapi.spec | 2 + 3 files changed, 81 insertions(+), 28 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 20ede7b13d1f..8360048421a0 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -57,6 +57,8 @@ @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) setupapi.CM_Get_DevNode_PropertyW +@ stdcall CM_Get_DevNode_Property_ExW(long ptr ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Property_ExW @ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyA @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExA diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 25d4040da058..6871f47023c9 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4177,47 +4177,26 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, return (have_guid || have_name); } -/*********************************************************************** - * SetupDiGetDevicePropertyW (SETUPAPI.@) - */ -BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_data, - const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, BYTE *prop_buff, - DWORD prop_buff_size, DWORD *required_size, DWORD flags) +static LSTATUS get_device_property(struct device *device, const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, + BYTE *prop_buff, DWORD prop_buff_size, DWORD *required_size, DWORD flags) { - static const WCHAR formatW[] = {'\\', '%', '0', '4', 'X', 0}; - WCHAR key_path[55] = {'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\\'}; + WCHAR key_path[55] = L"Properties\\"; HKEY hkey; DWORD value_type; DWORD value_size = 0; LSTATUS ls; - struct device *device; - - TRACE("%p, %p, %p, %p, %p, %d, %p, %#x\n", devinfo, device_data, prop_key, prop_type, prop_buff, prop_buff_size, - required_size, flags); - - if (!(device = get_device(devinfo, device_data))) - return FALSE; if (!prop_key) - { - SetLastError(ERROR_INVALID_DATA); - return FALSE; - } + return ERROR_INVALID_DATA; if (!prop_type || (!prop_buff && prop_buff_size)) - { - SetLastError(ERROR_INVALID_USER_BUFFER); - return FALSE; - } + return ERROR_INVALID_USER_BUFFER; if (flags) - { - SetLastError(ERROR_INVALID_FLAGS); - return FALSE; - } + return ERROR_INVALID_FLAGS; SETUPDI_GuidToString(&prop_key->fmtid, key_path + 11); - swprintf(key_path + 49, ARRAY_SIZE(key_path) - 49, formatW, prop_key->pid); + swprintf(key_path + 49, ARRAY_SIZE(key_path) - 49, L"\\%04X", prop_key->pid); ls = RegOpenKeyExW(device->key, key_path, 0, KEY_QUERY_VALUE, &hkey); if (!ls) @@ -4248,10 +4227,80 @@ BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_ if (required_size) *required_size = value_size; + return ls; +} + +/*********************************************************************** + * SetupDiGetDevicePropertyW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_data, + const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, BYTE *prop_buff, + DWORD prop_buff_size, DWORD *required_size, DWORD flags) +{ + struct device *device; + LSTATUS ls; + + TRACE("%p, %p, %p, %p, %p, %d, %p, %#x\n", devinfo, device_data, prop_key, prop_type, prop_buff, prop_buff_size, + required_size, flags); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + ls = get_device_property(device, prop_key, prop_type, prop_buff, prop_buff_size, required_size, flags); + SetLastError(ls); return !ls; } +/*********************************************************************** + * CM_Get_DevNode_Property_ExW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Property_ExW(DEVINST devnode, const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, + BYTE *prop_buff, ULONG *prop_buff_size, ULONG flags, HMACHINE machine) +{ + struct device *device = get_devnode_device(devnode); + LSTATUS ls; + + TRACE("%u, %p, %p, %p, %p, %#x, %p\n", devnode, prop_key, prop_type, prop_buff, prop_buff_size, + flags, machine); + + if (machine) + return CR_MACHINE_UNAVAILABLE; + + if (!device) + return CR_NO_SUCH_DEVINST; + + if (!prop_buff_size) + return CR_INVALID_POINTER; + + ls = get_device_property(device, prop_key, prop_type, prop_buff, *prop_buff_size, prop_buff_size, flags); + switch (ls) + { + case NO_ERROR: + return CR_SUCCESS; + case ERROR_INVALID_DATA: + return CR_INVALID_DATA; + case ERROR_INVALID_USER_BUFFER: + return CR_INVALID_POINTER; + case ERROR_INVALID_FLAGS: + return CR_INVALID_FLAG; + case ERROR_INSUFFICIENT_BUFFER: + return CR_BUFFER_SMALL; + case ERROR_NOT_FOUND: + return CR_NO_SUCH_VALUE; + } + return CR_FAILURE; +} + +/*********************************************************************** + * CM_Get_DevNode_PropertyW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_PropertyW(DEVINST dev, const DEVPROPKEY *key, DEVPROPTYPE type, + PVOID buf, PULONG len, ULONG flags) +{ + return CM_Get_DevNode_Property_ExW(dev, key, type, buf, len, flags, NULL); +} + /*********************************************************************** * SetupDiInstallDeviceInterfaces (SETUPAPI.@) */ diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 8c4ebcc1011e..74c252c6fd5f 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -67,6 +67,8 @@ @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) +@ stdcall CM_Get_DevNode_Property_ExW(long ptr ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) -- 2.24.0

1 0

[PATCH v2] atl: Fix the ATL_WNDCLASSINFOW::m_szAutoName member definition and construction.
by Hermès BÉLUSCA-MAÏTO 26 Jan '20

26 Jan '20

Signed-off-by: Hermes Belusca-Maito <hermes.belusca(a)sfr.fr>

1 0

[PATCH] dmime: Get rid of the DMUSIC_PRIVATE_PCHANNEL typedef
by Michael Stefaniuc 26 Jan '20

26 Jan '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/dmime_private.h | 10 ---------- dlls/dmime/performance.c | 6 +++++- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 983db7f62b..576ebc1ae8 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -102,16 +102,6 @@ typedef struct _DMUS_PRIVATE_TEMPO_PLAY_STATE { DWORD dummy; } DMUS_PRIVATE_TEMPO_PLAY_STATE, *LPDMUS_PRIVATE_TEMPO_PLAY_STATE; -/* some sort of aux. performance channel: as far as i can understand, these are - used to represent a particular midi channel in particular group at particular - group; so all we need to do is to fill it with parent port, group and midi - channel ? */ -typedef struct DMUSIC_PRIVATE_PCHANNEL_ { - DWORD channel; /* map to this channel... */ - DWORD group; /* ... in this group ... */ - IDirectMusicPort *port; /* ... at this port */ -} DMUSIC_PRIVATE_PCHANNEL, *LPDMUSIC_PRIVATE_PCHANNEL; - /********************************************************************** * Dll lifetime tracking declaration for dmime.dll */ diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 3dd54a6cb6..c492ebdcb1 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -27,7 +27,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); struct pchannel_block { DWORD block_num; /* Block 0 is PChannels 0-15, Block 1 is PChannels 16-31, etc */ - DMUSIC_PRIVATE_PCHANNEL pchannel[16]; + struct { + DWORD channel; /* MIDI channel */ + DWORD group; /* MIDI group */ + IDirectMusicPort *port; + } pchannel[16]; struct wine_rb_entry entry; }; -- 2.24.1

1 0

[PATCH] dmscript: Implement the Script track GetParam/SetParam methods
by Michael Stefaniuc 26 Jan '20

26 Jan '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmscript/scripttrack.c | 24 ++++++++++++++---------- dlls/dmscript/tests/dmscript.c | 11 ++++++++++- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index ad5617f414..1bdf3e13c5 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -124,20 +124,24 @@ static HRESULT WINAPI script_track_Play(IDirectMusicTrack8 *iface, void *pStateD return S_OK; } -static HRESULT WINAPI script_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI script_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, MUSIC_TIME *next, void *param) { - DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); + + return DMUS_E_GET_UNSUPPORTED; } -static HRESULT WINAPI script_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI script_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, void *param) { - DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p): not supported\n", This, debugstr_dmguid(type), time, param); + + return DMUS_E_SET_UNSUPPORTED; } static HRESULT WINAPI script_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index 365b006025..30b64d5788 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -207,6 +207,7 @@ static void test_scripttrack(void) IPersistStream *ps; CLSID class; ULARGE_INTEGER size; + char buf[64] = { 0 }; HRESULT hr; #define X(guid) &guid, #guid const struct { @@ -260,14 +261,22 @@ static void test_scripttrack(void) ok(hr == E_POINTER, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); hr = IDirectMusicTrack8_Play(dmt, NULL, 0, 0, 0, 0, NULL, NULL, 0); ok(hr == E_POINTER, "IDirectMusicTrack8_Play failed: %08x\n", hr); + } hr = IDirectMusicTrack8_GetParam(dmt, NULL, 0, NULL, NULL); ok(hr == DMUS_E_GET_UNSUPPORTED, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); - } for (i = 0; i < ARRAY_SIZE(unsupported); i++) { hr = IDirectMusicTrack8_IsParamSupported(dmt, unsupported[i].type); ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", unsupported[i].name, hr); + hr = IDirectMusicTrack8_GetParam(dmt, unsupported[i].type, 0, NULL, buf); + ok(hr == DMUS_E_GET_UNSUPPORTED, + "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", + unsupported[i].name, hr); + hr = IDirectMusicTrack8_SetParam(dmt, unsupported[i].type, 0, buf); + ok(hr == DMUS_E_SET_UNSUPPORTED, + "SetParam(%s) failed: %08x, expected DMUS_E_SET_UNSUPPORTED\n", + unsupported[i].name, hr); } hr = IDirectMusicTrack8_AddNotificationType(dmt, NULL); ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); -- 2.24.1

1 0