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

[PATCH 1/2] testbot/JobDetails: Highlight new errors in the full log too.
by Francois Gouget Jan. 28, 2020

Jan. 28, 2020

Extend $LogInfo to store the 1-based source line number of each error. For extra errors (i.e. errors not present in the source log), set the line number to 0. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 20 +++++++++---- testbot/web/JobDetails.pl | 46 +++++++++++++++++++++++++---- testbot/web/WineTestBot.css | 1 + 3 files changed, 57 insertions(+), 10 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 8187826e34..75d283381c 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -718,16 +718,17 @@ sub _AddLogGroup($$) if (!$LogInfo->{ErrGroups}->{$GroupName}) { push @{$LogInfo->{ErrGroupNames}}, $GroupName; - $LogInfo->{ErrGroups}->{$GroupName} = { Errors => [] }; + $LogInfo->{ErrGroups}->{$GroupName} = { LineNos => [], Errors => [] }; } return $LogInfo->{ErrGroups}->{$GroupName}; } -sub _AddLogError($$$) +sub _AddLogError($$$;$) { - my ($LogInfo, $ErrGroup, $Line) = @_; + my ($LogInfo, $ErrGroup, $Line, $LineNo) = @_; push @{$ErrGroup->{Errors}}, $Line; + push @{$ErrGroup->{LineNos}}, $LineNo || 0; $LogInfo->{ErrCount}++; } @@ -756,8 +757,13 @@ An array containing the names of all the error groups. A hashtable indexed by the error group name. Each entry contains: =over + =item Errors An array containing the error messages. + +=item LineNos +An array containing the line number of the error in the log file. + =back =back @@ -793,8 +799,10 @@ sub GetLogErrors($) $LogInfo->{ErrCount} ||= 0; my $CurrentModule = ""; my $CurrentGroup; + my $LineNo = 0; foreach my $Line (<$LogFile>) { + $LineNo++; $Line =~ s/\s*$//; if ($IsReport and $Line =~ /^([_.a-z0-9-]+):[_a-z0-9]* start /) { @@ -814,7 +822,7 @@ sub GetLogErrors($) { $CurrentGroup = _AddLogGroup($LogInfo, $CurrentModule); } - _AddLogError($LogInfo, $CurrentGroup, $Line); + _AddLogError($LogInfo, $CurrentGroup, $Line, $LineNo); } close($LogFile); } @@ -830,8 +838,10 @@ sub GetLogErrors($) $LogInfo->{ErrCount} ||= 0; # Add the related extra errors my $CurrentGroup; + my $LineNo = 0; foreach my $Line (<$LogFile>) { + $LineNo++; $Line =~ s/\s*$//; if (!$CurrentGroup) { @@ -840,7 +850,7 @@ sub GetLogErrors($) my $GroupName = $IsReport ? "Report errors" : "Task errors"; $CurrentGroup = _AddLogGroup($LogInfo, $GroupName); } - _AddLogError($LogInfo, $CurrentGroup, $Line); + _AddLogError($LogInfo, $CurrentGroup, $Line, $LineNo); } close($LogFile); } diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 2909eb7dbc..f1ffd498ed 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -351,19 +351,42 @@ sub GetErrorCategory($) return "error"; } -sub GenerateFullLog($$$;$) +sub GenerateFullLog($$$$;$) { - my ($self, $FileName, $HideLog, $Header) = @_; + my ($self, $FileName, $HideLog, $LogInfo, $Header) = @_; + + my %NewLineNos; + if ($LogInfo and $LogInfo->{NewCount}) + { + foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) + { + my $Group = $LogInfo->{ErrGroups}->{$GroupName}; + next if (!$Group->{NewCount}); + if (($FileName =~ /\.err$/) == + ($GroupName =~ /^(?:Report errors|Task errors|TestBot errors)$/)) + { + for my $ErrIndex (0..@{$Group->{Errors}} - 1) + { + if ($Group->{IsNew}->[$ErrIndex]) + { + $NewLineNos{$Group->{LineNos}->[$ErrIndex]} = 1; + } + } + } + } + } my $GetCategory = $FileName =~ /\.err$/ ? \&GetErrorCategory : $FileName =~ /\.report$/ ? \&GetReportLineCategory : \&GetLogLineCategory; + my $LineNo = 0; my $IsEmpty = 1; if (open(my $LogFile, "<", $FileName)) { foreach my $Line (<$LogFile>) { + $LineNo++; $Line =~ s/\s*$//; if ($IsEmpty) { @@ -372,8 +395,8 @@ sub GenerateFullLog($$$;$) $IsEmpty = 0; } - my $Category = $GetCategory->($Line); my $Html = $self->escapeHTML($Line); + my $Category = $NewLineNos{$LineNo} ? "fullnew" : $GetCategory->($Line); if ($Category ne "none") { $Html =~ s~^(.*\S)\s*\r?$~<span class='log-$Category'>$1</span>~; @@ -463,11 +486,24 @@ EOF # Show this log in full, highlighting the important lines # + my $LogInfo; + my $LogFileName = "$TaskDir/$MoreInfo->{Full}"; + if ($MoreInfo->{Full} =~ /\.report$/) + { + $LogInfo = GetLogErrors($LogFileName); + if ($LogInfo->{ErrCount}) + { + # Identify new errors in test reports + my $RefReportPath = $StepTask->GetFullFileName($StepTask->GetRefReportName($MoreInfo->{Full})); + TagNewErrors($RefReportPath, $LogInfo); + } + } + my ($Action, $Url) = $self->GetMoreInfoLink($Key, GetLogLabel($MoreInfo->{Full}), "Full", $MoreInfo->{Full}); $Url = $self->CGI->escapeHTML($Url); my $HideLog = $Action eq "Hide" ? " ondblclick='HideLog(event, \"$Url\")'" : ""; - my $LogIsEmpty = $self->GenerateFullLog("$TaskDir/$MoreInfo->{Full}", $HideLog); + my $LogIsEmpty = $self->GenerateFullLog($LogFileName, $HideLog, $LogInfo); my $EmptyDiag; if ($LogIsEmpty) { @@ -490,7 +526,7 @@ EOF my $ErrHeader = $MoreInfo->{Full} =~ /\.report/ ? "report" : "task"; $ErrHeader = "old $ErrHeader" if ($MoreInfo->{Full} =~ /^old_/); $ErrHeader = "<div class='HrTitle'>". ucfirst($ErrHeader) ." errors<div class='HrLine'></div></div>"; - my $ErrIsEmpty = $self->GenerateFullLog("$TaskDir/$MoreInfo->{Full}.err", $HideLog, $ErrHeader); + my $ErrIsEmpty = $self->GenerateFullLog("$LogFileName.err", $HideLog, $LogInfo, $ErrHeader); print $EmptyDiag if ($ErrIsEmpty and defined $EmptyDiag); } else diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index f588355833..9a23f5fa82 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -402,6 +402,7 @@ pre .log-boterror { color: #cc0052; } .log-diag { color: #e56300; } .log-new { color: #e56e00; font-weight: bold; } +.log-fullnew { color: red; font-weight: bold; } a.title { color:inherit; text-decoration: none; } -- 2.20.1

1 1

[PATCH] testbot/LogUtils: Store the filename in the $LogInfo structures.
by Francois Gouget Jan. 28, 2020

Jan. 28, 2020

Also standardize on $LogPath for the full path to log files, and $LogName for their basename, which matches the field names. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This patch is still about improving the Parse*() and GetLogError() APIs: the new fields are not used yet but will be in following patches. testbot/lib/WineTestBot/LogUtils.pm | 55 ++++++++++++++++++----------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 9aa2e81c70..8187826e34 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -90,16 +90,22 @@ Contains an error message if the task log could not be read. sub ParseTaskLog($) { - my ($FileName) = @_; + my ($LogPath) = @_; + + my $LogName = basename($LogPath); + my $LogInfo = { + LogName => $LogName, + LogPath => $LogPath, + }; my $LogFile; - if (!open($LogFile, "<", $FileName)) + if (!open($LogFile, "<", $LogPath)) { - my $LogName = basename($FileName); - return {BadLog => "Unable to open '$LogName' for reading: $!"}; + $LogInfo->{BadLog} = "Unable to open '$LogName' for reading: $!"; + return $LogInfo; } - my $LogInfo = {Type => "build"}; + $LogInfo->{Type} = "build"; foreach my $Line (<$LogFile>) { chomp $Line; @@ -362,16 +368,12 @@ Contains an error message if the report could not be read. sub ParseWineTestReport($$$) { - my ($FileName, $IsWineTest, $TaskTimedOut) = @_; - - my $LogFile; - if (!open($LogFile, "<", $FileName)) - { - my $LogName = basename($FileName); - return {BadLog => "Unable to open '$LogName' for reading: $!"}; - } + my ($LogPath, $IsWineTest, $TaskTimedOut) = @_; + my $LogName = basename($LogPath); my $LogInfo = { + LogName => $LogName, + LogPath => $LogPath, IsWineTest => $IsWineTest, TaskTimedOut => $TaskTimedOut, @@ -381,6 +383,13 @@ sub ParseWineTestReport($$$) Extra => [], }; + my $LogFile; + if (!open($LogFile, "<", $LogPath)) + { + $LogInfo->{BadLog} = "Unable to open '$LogName' for reading: $!"; + return $LogInfo; + } + my $Cur = _NewCurrentUnit("", ""); foreach my $Line (<$LogFile>) { @@ -757,10 +766,10 @@ An array containing the error messages. sub GetLogErrors($) { - my ($LogFileName) = @_; + my ($LogPath) = @_; my ($IsReport, $GetCategory); - if ($LogFileName =~ /\.report$/) + if ($LogPath =~ /\.report$/) { $IsReport = 1; $GetCategory = \&GetReportLineCategory; @@ -770,12 +779,16 @@ sub GetLogErrors($) $GetCategory = \&GetLogLineCategory; } + my $LogName = basename($LogPath); my $LogInfo = { + LogName => $LogName, + LogPath => $LogPath, + ErrCount => undef, # until we open a log ErrGroupNames => [], ErrGroups => {}, }; - if (open(my $LogFile, "<", $LogFileName)) + if (open(my $LogFile, "<", $LogPath)) { $LogInfo->{ErrCount} ||= 0; my $CurrentModule = ""; @@ -805,14 +818,14 @@ sub GetLogErrors($) } close($LogFile); } - elsif (-f $LogFileName) + elsif (-f $LogPath) { - $LogInfo->{BadLog} = "Could not open '". basename($LogFileName) ."' for reading: $!"; + $LogInfo->{BadLog} = "Could not open '$LogName' for reading: $!"; my $Group = _AddLogGroup($LogInfo, "TestBot errors"); _AddLogError($LogInfo, $Group, $LogInfo->{BadLog}); } - if (open(my $LogFile, "<", "$LogFileName.err")) + if (open(my $LogFile, "<", "$LogPath.err")) { $LogInfo->{ErrCount} ||= 0; # Add the related extra errors @@ -831,9 +844,9 @@ sub GetLogErrors($) } close($LogFile); } - elsif (-f "$LogFileName.err") + elsif (-f "$LogPath.err") { - $LogInfo->{BadLog} ||= "Could not open '". basename($LogFileName) .".err' for reading: $!"; + $LogInfo->{BadLog} ||= "Could not open '$LogName.err' for reading: $!"; my $Group = _AddLogGroup($LogInfo, "TestBot errors"); _AddLogError($LogInfo, $Group, $LogInfo->{BadLog}); } -- 2.20.1

1 0

[PATCH] ucrtbase: Add _query_new_handler() and _query_new_mode().
by Nikolay Sivov Jan. 28, 2020

Jan. 28, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- .../api-ms-win-crt-heap-l1-1-0.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec index 0a99e870be..0885d5813e 100644 --- a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec +++ b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec @@ -16,8 +16,8 @@ @ cdecl _heapwalk(ptr) ucrtbase._heapwalk @ cdecl _malloc_base(long) ucrtbase._malloc_base @ cdecl _msize(ptr) ucrtbase._msize -@ stub _query_new_handler -@ stub _query_new_mode +@ cdecl _query_new_handler() ucrtbase._query_new_handler +@ cdecl _query_new_mode() ucrtbase._query_new_mode @ cdecl _realloc_base(ptr long) ucrtbase._realloc_base @ cdecl _recalloc(ptr long long) ucrtbase._recalloc @ cdecl _set_new_mode(long) ucrtbase._set_new_mode diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 3d8dd5807a..568019da51 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1856,8 +1856,8 @@ @ cdecl _putwch_nolock(long) @ cdecl _putws(wstr) MSVCRT__putws @ stub _query_app_type -@ stub _query_new_handler -@ stub _query_new_mode +@ cdecl _query_new_handler() MSVCRT__query_new_handler +@ cdecl _query_new_mode() MSVCRT__query_new_mode @ cdecl _read(long ptr long) MSVCRT__read @ cdecl _realloc_base(ptr long) @ cdecl _recalloc(ptr long long) -- 2.24.1

2 1

[PATCH v4] msvcrt: Fix the btowc() function.
by Chip Davis Jan. 28, 2020

Jan. 28, 2020

This function returns WEOF on conversion failure. It should only operate on single-byte characters in the C locale. Finally, it should use the current locale's codepage, instead of the current locale itself, to do conversions. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- v4: Fix the tests. This was meant to be included in v3. --- dlls/msvcrt/locale.c | 10 ++++-- dlls/msvcrt/tests/string.c | 73 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index ae9f7c9c2166..72a52a20a900 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -786,9 +786,13 @@ MSVCRT_wint_t CDECL MSVCRT_btowc(int c) unsigned char letter = c; MSVCRT_wchar_t ret; - if(!MultiByteToWideChar(get_locinfo()->lc_handle[MSVCRT_LC_CTYPE], - 0, (LPCSTR)&letter, 1, &ret, 1)) - return 0; + if(c == MSVCRT_EOF) + return MSVCRT_WEOF; + if(!get_locinfo()->lc_codepage) + return c & 255; + if(!MultiByteToWideChar(get_locinfo()->lc_codepage, + MB_ERR_INVALID_CHARS, (LPCSTR)&letter, 1, &ret, 1)) + return MSVCRT_WEOF; return ret; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index da0400fa832f..f988e0ccb5f0 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -90,6 +90,7 @@ static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements); static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements); static int (__cdecl *p_wctob)(wint_t); +static wint_t (__cdecl *p_btowc)(int); static size_t (__cdecl *p_wcrtomb)(char*, wchar_t, mbstate_t*); static int (__cdecl *p_wcrtomb_s)(size_t*, char*, size_t, wchar_t, mbstate_t*); static int (__cdecl *p_tolower)(int); @@ -2880,6 +2881,76 @@ static void test_wctob(void) _setmbcp(cp); } +static void test_btowc(void) +{ + wint_t ret; + int cp = _getmbcp(); + + if(!p_btowc || !setlocale(LC_ALL, "chinese-traditional")) { + win_skip("Skipping btowc tests\n"); + return; + } + + ret = p_btowc(EOF); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == WEOF, "ret = %x\n", ret); + + _setmbcp(1250); + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == WEOF, "ret = %x\n", ret); + + setlocale(LC_CTYPE, ".1250"); + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == 0x81, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == 0x155, "ret = %x\n", ret); + + ret = p_btowc(0x100); + ok(ret == 0x00, "ret = %x\n", ret); + + ret = p_btowc(0x1e0); + ok(ret == 0x155, "ret = %x\n", ret); + + setlocale(LC_ALL, "C"); + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == 0x81, "ret = %x\n", ret); + + ret = p_btowc(0x9f); + ok(ret == 0x9f, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == 0xe0, "ret = %x\n", ret); + + ret = p_btowc(0x100); + ok(ret == 0x00, "ret = %x\n", ret); + + ret = p_btowc(0x1e0); + ok(ret == 0xe0, "ret = %x\n", ret); + + _setmbcp(cp); +} + static void test_wctomb(void) { mbstate_t state; @@ -4127,6 +4198,7 @@ START_TEST(string) p_wcslwr_s = (void*)GetProcAddress(hMsvcrt, "_wcslwr_s"); p_mbsupr_s = (void*)GetProcAddress(hMsvcrt, "_mbsupr_s"); p_mbslwr_s = (void*)GetProcAddress(hMsvcrt, "_mbslwr_s"); + p_btowc = (void*)GetProcAddress(hMsvcrt, "btowc"); p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); p_wcrtomb = (void*)GetProcAddress(hMsvcrt, "wcrtomb"); p_wcrtomb_s = (void*)GetProcAddress(hMsvcrt, "wcrtomb_s"); @@ -4204,6 +4276,7 @@ START_TEST(string) test__mbsupr_s(); test__mbslwr_s(); test_wctob(); + test_btowc(); test_wctomb(); test__atodbl(); test__stricmp(); -- 2.24.0

2 1

[PATCH v5] msado15: Implement _Connection get/put ConnectionString.
by Hans Leidekker Jan. 28, 2020

Jan. 28, 2020

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> v5: Handle error from SysAllocString. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/connection.c | 24 ++++++++++++++++++++---- dlls/msado15/tests/msado15.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 73b225628c..2f0aa0c8df 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -37,6 +37,7 @@ struct connection LONG refs; ObjectStateEnum state; LONG timeout; + WCHAR *datasource; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -62,6 +63,7 @@ static ULONG WINAPI connection_Release( _Connection *iface ) if (!refs) { TRACE( "destroying %p\n", connection ); + heap_free( connection->datasource ); heap_free( connection ); } return refs; @@ -125,14 +127,27 @@ static HRESULT WINAPI connection_get_Properties( _Connection *iface, Properties static HRESULT WINAPI connection_get_ConnectionString( _Connection *iface, BSTR *str ) { - FIXME( "%p, %p\n", iface, str ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + BSTR source = NULL; + + TRACE( "%p, %p\n", connection, str ); + + if (connection->datasource && !(source = SysAllocString( connection->datasource ))) return E_OUTOFMEMORY; + *str = source; + return S_OK; } static HRESULT WINAPI connection_put_ConnectionString( _Connection *iface, BSTR str ) { - FIXME( "%p, %s\n", iface, debugstr_w(str) ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + WCHAR *source = NULL; + + TRACE( "%p, %s\n", connection, debugstr_w( !wcsstr( str, L"Password" ) ? L"<hidden>" : str ) ); + + if (str && !(source = strdupW( str ))) return E_OUTOFMEMORY; + heap_free( connection->datasource ); + connection->datasource = source; + return S_OK; } static HRESULT WINAPI connection_get_CommandTimeout( _Connection *iface, LONG *timeout ) @@ -392,6 +407,7 @@ HRESULT Connection_create( void **obj ) connection->refs = 1; connection->state = adStateClosed; connection->timeout = 30; + connection->datasource = NULL; *obj = &connection->Connection_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 917d131063..fb77936bba 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -667,6 +667,7 @@ static void test_Connection(void) IRunnableObject *runtime; ISupportErrorInfo *errorinfo; LONG state, timeout; + BSTR str, str2; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); ok( hr == S_OK, "got %08x\n", hr ); @@ -702,6 +703,35 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + str = (BSTR)0xdeadbeef; + hr = _Connection_get_ConnectionString(connection, &str); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(str == NULL, "got %p\n", str); + + str = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test"); + hr = _Connection_put_ConnectionString(connection, str); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + +if (0) /* Crashes on windows */ +{ + hr = _Connection_get_ConnectionString(connection, NULL); + ok(hr == E_POINTER, "Failed, hr 0x%08x\n", hr); +} + + str2 = NULL; + hr = _Connection_get_ConnectionString(connection, &str2); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(!wcscmp(str, str2), "wrong string %s\n", wine_dbgstr_w(str2)); + SysFreeString(str); + SysFreeString(str2); + + hr = _Connection_put_ConnectionString(connection, NULL); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + + str = (BSTR)0xdeadbeef; + hr = _Connection_get_ConnectionString(connection, &str); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(str == NULL, "got %p\n", str); _Connection_Release(connection); } -- 2.20.1

1 0

[PATCH] user32: Improve window state handling in SetScrollInfo().
by Nikolay Sivov Jan. 28, 2020

Jan. 28, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42038 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/scroll.c | 6 ++++++ dlls/user32/tests/scroll.c | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index d611cf0060..1d6c048429 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -1750,6 +1750,12 @@ static INT SCROLL_SetScrollInfo( HWND hwnd, INT nBar, LPCSCROLLINFO info, BOOL b action |= SA_SSI_SHOW; } + if (nBar == SB_CTL && bRedraw && IsWindowVisible(hwnd) && + (new_flags == ESB_ENABLE_BOTH || new_flags == ESB_DISABLE_BOTH)) + { + EnableWindow(hwnd, new_flags == ESB_ENABLE_BOTH); + } + if (infoPtr->flags != new_flags) /* check arrow flags */ { infoPtr->flags = new_flags; diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 9c892ed484..7181a02874 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -634,7 +634,6 @@ static void test_SetScrollInfo(void) si.nPage = 50; SetScrollInfo(hScroll, SB_CTL, &si, TRUE); ret = IsWindowEnabled(hScroll); -todo_wine ok(ret, "Unexpected enabled state.\n"); si.fMask = SIF_POS|SIF_RANGE|SIF_PAGE|SIF_DISABLENOSCROLL; @@ -657,7 +656,6 @@ todo_wine si.nPage = 100; SetScrollInfo(hScroll, SB_CTL, &si, TRUE); ret = IsWindowEnabled(hScroll); -todo_wine ok(!ret, "Unexpected enabled state.\n"); EnableScrollBar(hScroll, SB_CTL, ESB_DISABLE_BOTH); @@ -671,7 +669,6 @@ todo_wine si.nPage = 41; SetScrollInfo(hScroll, SB_CTL, &si, TRUE); ret = IsWindowEnabled(hScroll); -todo_wine ok(ret, "Unexpected enabled state.\n"); DestroyWindow(hScroll); -- 2.24.1

2 1

[website] German translation for release 5.0
by Julian Rüger Jan. 28, 2020

Jan. 28, 2020

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH 1/5] ole32: Fix equality check in CommonPrefixWith() for pointer moniker.
by Nikolay Sivov Jan. 28, 2020

Jan. 28, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/pointermoniker.c | 49 ++++++++++++++++++++----------------- dlls/ole32/tests/moniker.c | 41 ++++++++++++++++++++++++++++++- 2 files changed, 66 insertions(+), 24 deletions(-) diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index a62ce3e7b7..c1a0e2ae1c 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -48,9 +48,10 @@ typedef struct PointerMonikerImpl{ static inline PointerMonikerImpl *impl_from_IMoniker(IMoniker *iface) { -return CONTAINING_RECORD(iface, PointerMonikerImpl, IMoniker_iface); + return CONTAINING_RECORD(iface, PointerMonikerImpl, IMoniker_iface); } +static PointerMonikerImpl *unsafe_impl_from_IMoniker(IMoniker *iface); static HRESULT WINAPI PointerMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) { @@ -58,7 +59,6 @@ PointerMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); - /* Perform a sanity check on the parameters.*/ if ( (This==0) || (ppvObject==0) ) return E_INVALIDARG; @@ -337,26 +337,20 @@ PointerMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoni /****************************************************************************** * PointerMoniker_IsEqual ******************************************************************************/ -static HRESULT WINAPI -PointerMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) +static HRESULT WINAPI PointerMonikerImpl_IsEqual(IMoniker *iface, IMoniker *other) { - PointerMonikerImpl *This = impl_from_IMoniker(iface); - DWORD mkSys; + PointerMonikerImpl *moniker = impl_from_IMoniker(iface), *other_moniker; - TRACE("(%p,%p)\n",iface,pmkOtherMoniker); - - if (pmkOtherMoniker==NULL) - return S_FALSE; + TRACE("%p, %p.\n", iface, other); - IMoniker_IsSystemMoniker(pmkOtherMoniker,&mkSys); + if (!other) + return E_INVALIDARG; - if (mkSys==MKSYS_POINTERMONIKER) - { - PointerMonikerImpl *pOtherMoniker = impl_from_IMoniker(pmkOtherMoniker); - return This->pObject == pOtherMoniker->pObject ? S_OK : S_FALSE; - } - else + other_moniker = unsafe_impl_from_IMoniker(other); + if (!other_moniker) return S_FALSE; + + return moniker->pObject == other_moniker->pObject ? S_OK : S_FALSE; } /****************************************************************************** @@ -412,18 +406,20 @@ PointerMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk) /****************************************************************************** * PointerMoniker_CommonPrefixWith ******************************************************************************/ -static HRESULT WINAPI -PointerMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** ppmkPrefix) +static HRESULT WINAPI PointerMonikerImpl_CommonPrefixWith(IMoniker *iface, IMoniker *other, IMoniker **prefix) { - TRACE("(%p, %p)\n", pmkOther, ppmkPrefix); + TRACE("%p, %p, %p.\n", iface, other, prefix); + + if (!prefix || !other) + return E_INVALIDARG; - *ppmkPrefix = NULL; + *prefix = NULL; - if (PointerMonikerImpl_IsEqual(iface, pmkOther)) + if (PointerMonikerImpl_IsEqual(iface, other) == S_OK) { IMoniker_AddRef(iface); - *ppmkPrefix=iface; + *prefix = iface; return MK_S_US; } @@ -539,6 +535,13 @@ static const IMonikerVtbl VT_PointerMonikerImpl = PointerMonikerImpl_IsSystemMoniker }; +static PointerMonikerImpl *unsafe_impl_from_IMoniker(IMoniker *iface) +{ + if (iface->lpVtbl != &VT_PointerMonikerImpl) + return NULL; + return CONTAINING_RECORD(iface, PointerMonikerImpl, IMoniker_iface); +} + /****************************************************************************** * PointerMoniker_Construct (local function) *******************************************************************************/ diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 8c533d1ff7..bec5c76caa 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2625,7 +2625,7 @@ todo_wine static void test_pointer_moniker(void) { - IMoniker *moniker, *inverse; + IMoniker *moniker, *moniker2, *prefix, *inverse; IEnumMoniker *enummoniker; HRESULT hr; DWORD moniker_type; @@ -2748,6 +2748,45 @@ todo_wine ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); IMoniker_Release(moniker); + + /* CommonPrefixWith() */ + hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, &moniker); + ok(hr == S_OK, "Failed to create moniker, hr %#x.\n", hr); + + hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, &moniker2); + ok(hr == S_OK, "Failed to create moniker, hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker, moniker2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, NULL, &prefix); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &prefix); + ok(hr == MK_S_US, "Unexpected hr %#x.\n", hr); + ok(prefix == moniker, "Unexpected pointer.\n"); + IMoniker_Release(prefix); + + IMoniker_Release(moniker2); + + hr = CreatePointerMoniker((IUnknown *)moniker, &moniker2); + ok(hr == S_OK, "Failed to create moniker, hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker, moniker2); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &prefix); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + IMoniker_Release(moniker2); + + IMoniker_Release(moniker); } static void test_bind_context(void) -- 2.24.1

2 7

[PATCH 1/5] winegstreamer: Report MEDIASUBTYPE_IEEE_FLOAT for float types.
by Zebediah Figura Jan. 28, 2020

Jan. 28, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 8213bfdb439..de508b4167b 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -169,6 +169,7 @@ static gboolean amt_from_gst_caps_audio_raw(const GstCaps *caps, AM_MEDIA_TYPE * wfe->dwChannelMask = 0; } if (GST_AUDIO_INFO_IS_FLOAT(&ainfo)) { + amt->subtype = MEDIASUBTYPE_IEEE_FLOAT; wfe->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; wfx->wBitsPerSample = wfe->Samples.wValidBitsPerSample = 32; } else { -- 2.25.0

1 4

[PATCH v4] msado15: Implement _Connection get/put ConnectionString
by Alistair Leslie-Hughes Jan. 28, 2020

Jan. 28, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 31 +++++++++++++++++++++++++++---- dlls/msado15/tests/msado15.c | 20 ++++++++++++++++++++ 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 73b225628c..0a1e8de668 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -37,6 +37,7 @@ struct connection LONG refs; ObjectStateEnum state; LONG timeout; + WCHAR *datasource; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -62,6 +63,7 @@ static ULONG WINAPI connection_Release( _Connection *iface ) if (!refs) { TRACE( "destroying %p\n", connection ); + heap_free( connection->datasource ); heap_free( connection ); } return refs; @@ -125,14 +127,34 @@ static HRESULT WINAPI connection_get_Properties( _Connection *iface, Properties static HRESULT WINAPI connection_get_ConnectionString( _Connection *iface, BSTR *str ) { - FIXME( "%p, %p\n", iface, str ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + + TRACE( "%p, %p\n", connection, str ); + + *str = SysAllocString( connection->datasource ); + + return S_OK; } static HRESULT WINAPI connection_put_ConnectionString( _Connection *iface, BSTR str ) { - FIXME( "%p, %s\n", iface, debugstr_w(str) ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + + TRACE( "%p\n", connection ); + + if (str && !wcsstr(str, L"Password")) + TRACE( "datasource: %s\n", debugstr_w(str) ); + + heap_free( connection->datasource ); + connection->datasource = NULL; + if (str) + { + connection->datasource = strdupW(str); + if (!connection->datasource) + return E_OUTOFMEMORY; + } + + return S_OK; } static HRESULT WINAPI connection_get_CommandTimeout( _Connection *iface, LONG *timeout ) @@ -392,6 +414,7 @@ HRESULT Connection_create( void **obj ) connection->refs = 1; connection->state = adStateClosed; connection->timeout = 30; + connection->datasource = NULL; *obj = &connection->Connection_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 917d131063..de3d6270d5 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -667,6 +667,7 @@ static void test_Connection(void) IRunnableObject *runtime; ISupportErrorInfo *errorinfo; LONG state, timeout; + BSTR connect1, connect2; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); ok( hr == S_OK, "got %08x\n", hr ); @@ -702,6 +703,25 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + hr = _Connection_put_ConnectionString(connection, NULL); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + + connect1 = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test"); + hr = _Connection_put_ConnectionString(connection, connect1); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + +if (0) /* Crashes on windows */ +{ + hr = _Connection_get_ConnectionString(connection, NULL); + ok(hr == E_POINTER, "Failed, hr 0x%08x\n", hr); +} + + hr = _Connection_get_ConnectionString(connection, &connect2); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(wcscmp(connect1, connect2) == 0, "wrong string %s\n", wine_dbgstr_w(connect2)); + SysFreeString(connect1); + SysFreeString(connect2); + _Connection_Release(connection); } -- 2.17.1

1 0