- Wine-Devel - list.winehq.org

[PATCH] webservices: Implement WS_CHANNEL_PROPERTY_NO_DELAY.
by Hans Leidekker March 16, 2021

March 16, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index f2906c86733..fd7c8d6029d 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -971,6 +971,7 @@ static HRESULT connect_channel_tcp( struct channel *channel ) { struct sockaddr_storage storage; struct sockaddr *addr = (struct sockaddr *)&storage; + BOOL nodelay = FALSE; int addr_len; WS_URL_SCHEME_TYPE scheme; WCHAR *host; @@ -1002,6 +1003,8 @@ static HRESULT connect_channel_tcp( struct channel *channel ) return HRESULT_FROM_WIN32( WSAGetLastError() ); } + prop_get( channel->prop, channel->prop_count, WS_CHANNEL_PROPERTY_NO_DELAY, &nodelay, sizeof(nodelay) ); + setsockopt( channel->u.tcp.socket, IPPROTO_TCP, TCP_NODELAY, (const char *)&nodelay, sizeof(nodelay) ); return S_OK; } @@ -2410,7 +2413,12 @@ HRESULT channel_accept_tcp( SOCKET socket, HANDLE wait, HANDLE cancel, WS_CHANNE return E_INVALIDARG; } - hr = sock_accept( socket, wait, cancel, &channel->u.tcp.socket ); + if ((hr = sock_accept( socket, wait, cancel, &channel->u.tcp.socket )) == S_OK) + { + BOOL nodelay = FALSE; + prop_get( channel->prop, channel->prop_count, WS_CHANNEL_PROPERTY_NO_DELAY, &nodelay, sizeof(nodelay) ); + setsockopt( channel->u.tcp.socket, IPPROTO_TCP, TCP_NODELAY, (const char *)&nodelay, sizeof(nodelay) ); + } LeaveCriticalSection( &channel->cs ); return hr; -- 2.30.2

1 0

[tools] winetest: Remove support for CVS revisions.
by Francois Gouget March 16, 2021

March 16, 2021

Don't expect them in the WineTest reports and don't store them in the per-report summary.txt files. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This will allow removing the corresponding placeholders from WineTest and TestLauncher next. --- winetest/dissect | 28 ++++++++++++++-------------- winetest/gather | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index dbbbe6b6d..4f0e95b36 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -239,11 +239,11 @@ open IN, "<:raw", $report or mydie "could not open '$report' for reading: $!"; # summary.txt file format: # Version <version> -# - <dll> - missing - - - - - -# - <dll> - skipped - - - - - -# - <dll> <unit> skipped - - - <source> <rev> -# - <dll> <unit> failed (258|crash) - - <source> <rev> -# - <dll> <unit> <total> <todo> <failures> <skipped> <source> <rev> +# - <dll> - missing - - - - +# - <dll> - skipped - - - - +# - <dll> <unit> skipped - - - <source> +# - <dll> <unit> failed (258|crash) - - <source> +# - <dll> <unit> <total> <todo> <failures> <skipped> <source> open SUM, ">$tmpdir/summary.txt" or mydie "could not open '$tmpdir/summary.txt' for writing: $!"; my $line = <IN> || ""; @@ -431,11 +431,11 @@ while ($line = <IN> || "") # For compatibility with old WineTest versions $info =~ /^(?:failed|unknown|version not available)$/) { - print SUM "- $dll - missing - - - - -\n"; + print SUM "- $dll - missing - - - -\n"; } elsif ($info eq "skipped") { - print SUM "- $dll - skipped - - - - -\n"; + print SUM "- $dll - skipped - - - -\n"; mydie "too many dlls skipped by user request (>$maxuserskips at $dll)" if ++$skipped_units > $maxuserskips; } } @@ -445,7 +445,7 @@ while ($line = <IN> || "") # Parse the tests output # -my ($dll, $unit, $units_re, $source, $rev, $result) = ("", "", "", ""); +my ($dll, $unit, $units_re, $source, $result) = ("", "", "", ""); my $unitsize = 0; my %units; my ($failures, $todo, $skipped) = (0, 0, 0); @@ -570,7 +570,7 @@ sub close_test_unit($) $failures += $extra_failures; $summary = "$s_total $todo $failures $skipped" if (!defined $summary); - print SUM "- $dll $unit $summary $source $rev\n"; + print SUM "- $dll $unit $summary $source\n"; if ($failures && ++$failed_units > $maxfailedtests) { mydie "too many failed test units (>$maxfailedtests at $dll:$unit)"; } @@ -591,14 +591,14 @@ while ($line = <IN>) { next if ($line =~ /^\s*$/); # empty lines have no impact chomp $line; $line =~ s/\r+$//; - if ($line =~ m%^([_.a-z0-9-]+):([_a-z0-9]+) (start|skipped) (-|[/_.a-z0-9-]+) (-|[.0-9a-f]+)$%) + if ($line =~ m%^([_.a-z0-9-]+):([_a-z0-9]+) (start|skipped) (-|[/_.a-z0-9-]+)%) { - my ($l_dll, $l_unit, $l_type, $l_source, $l_rev) = ($1, $2, $3, $4, $5); + my ($l_dll, $l_unit, $l_type, $l_source) = ($1, $2, $3, $4); # Close the previous test unit close_test_unit(0) if ($dll ne ""); - ($dll, $unit, $source, $rev) = ($l_dll, $l_unit, $l_source, $l_rev); + ($dll, $unit, $source) = ($l_dll, $l_unit, $l_source); %units = ($unit => 1); $units_re = $unit; @@ -606,7 +606,7 @@ while ($line = <IN>) { if ($l_type eq "skipped") { add_test_line("skipped", "Skipped by user request"); - print SUM "- $dll $unit skipped - - - $source $rev\n"; + print SUM "- $dll $unit skipped - - - $source\n"; mydie "too many test units skipped by user request (>$maxuserskips at $dll:$unit)" if ++$skipped_units > $maxuserskips; $rc = 0; } @@ -771,7 +771,7 @@ while ($line = <IN>) { # 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 # inconsistent results too. - ($dll, $unit, $source, $rev) = ($l_dll, $l_unit, "-", "-"); + ($dll, $unit, $source) = ($l_dll, $l_unit, "-"); %units = ($unit => 1); $units_re = $unit; $broken = 1; diff --git a/winetest/gather b/winetest/gather index 392e8e63f..a0b259b0d 100755 --- a/winetest/gather +++ b/winetest/gather @@ -312,7 +312,7 @@ foreach my $file (glob "$builddir/*/summary.txt") { while (<TEST>) { next if /^Archive: /; my ($dummy, $dll, $unit, $count, $todos, $errors, $skips, - $source, $rev) = split; + $source) = split; my $testname = "$dll:$unit"; if ($count eq "missing") -- 2.20.1

1 0

[tools] testbot/TestLauncher: Don't use an empty test unit name on skip lines.
by Francois Gouget March 16, 2021

March 16, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/TestLauncher/TestLauncher.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 7b58c9ad1..b92d09bf2 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -87,7 +87,11 @@ BOOL CALLBACK DetectCriticalErrorDialog(HWND TopWnd, LPARAM lParam) if (Reason) { Skips++; - printf("%s.c:0: Tests skipped: %s (details below)\n", Subtest, Reason); + /* An empty test unit name is allowed on the start, summary and done + * lines, but not on individual failure / skip lines. + */ + printf("%s.c:0: Tests skipped: %s (details below)\n", + (*Subtest ? Subtest : "testlauncher"), Reason); printf("| %s\n", Buffer); EnumChildWindows(TopWnd, DumpCriticalErrorDescription, (LPARAM)TopWnd); /* Leave the dialog open so it appears on screenshots */ -- 2.20.1

1 0

[tools] testbot/TestLauncher: Show the tool name in error messages.
by Francois Gouget March 16, 2021

March 16, 2021

Format the error messages so that they are easily recognized as such. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/TestLauncher/TestLauncher.c | 58 +++++++++++++++++++------ 1 file changed, 44 insertions(+), 14 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index b92d09bf2..dd34a7626 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -27,6 +27,28 @@ #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +/* + * Error handling + */ + +#ifdef __GNUC__ +# define FORMAT(fmt, arg1) __attribute__((format (printf, fmt, arg1) )) +#else +# define FORMAT(fmt, arg1) +#endif +void Error(const char* Format, ...) FORMAT(1,2); + +static const char *Name0; +void Error(const char* Format, ...) +{ + va_list valist; + fprintf(stderr, "%s:error: ", Name0); + va_start(valist, Format); + vfprintf(stderr, Format, valist); + va_end(valist); +} + + /* * Missing dll and entry point detection. */ @@ -116,12 +138,20 @@ int main(int argc, char *argv[]) const char *Suffix; char TestName[MAX_PATH]; int TestArg; - char *CommandLine; + char *CommandLine, *p; int CommandLen; STARTUPINFOA StartupInfo; PROCESS_INFORMATION ProcessInformation; DWORD ExitCode; + Name0 = p = argv[0]; + while (*p != '\0') + { + if (*p == '/' || *p == '\\') + Name0 = p + 1; + p++; + } + TimeOut = INFINITE; CommandLine = NULL; Arg = 1; @@ -138,8 +168,8 @@ int main(int argc, char *argv[]) TimeOut = (DWORD) strtoul(argv[Arg + 1], &EndPtr, 10) * 1000; if (*EndPtr != '\0') { - fprintf(stderr, "Invalid TimeOut value %s\n", argv[Arg + 1]); - exit(1); + Error("Invalid TimeOut value %s\n", argv[Arg + 1]); + return 1; } } else @@ -150,9 +180,9 @@ int main(int argc, char *argv[]) { if (GetFullPathNameA(argv[Arg], ARRAY_SIZE(TestExeFullName), TestExeFullName, &TestExeFileName) == 0) { - fprintf(stderr, "Can't determine full path of test executable %s, error %lu\n", + Error("Cauld not get the test executable full path %s (error %lu)\n", argv[Arg], GetLastError()); - exit(1); + return 1; } Suffix = strstr(TestExeFileName, "_test.exe"); if (Suffix == NULL) @@ -175,8 +205,8 @@ int main(int argc, char *argv[]) CommandLine = (char *) malloc(CommandLen); if (CommandLine == NULL) { - fprintf(stderr, "Unable to allocate memory for child command line\n"); - exit(1); + Error("Unable to allocate memory for child command line\n"); + return 1; } CommandLine[0] = '"'; @@ -197,7 +227,7 @@ int main(int argc, char *argv[]) if (UsageError) { fprintf(stderr, "Usage: %s [-t TimeOut] TestExecutable.exe [TestParameter...]\n", argv[0]); - exit(1); + return 1; } Start = GetTickCount(); @@ -218,8 +248,8 @@ int main(int argc, char *argv[]) */ if (! CreateProcessA(NULL, CommandLine, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, NULL, NULL, &StartupInfo, &ProcessInformation)) { - fprintf(stderr, "CreateProcess failed with error %lu\n", GetLastError()); - exit(1); + Error("CreateProcess failed (error %lu)\n", GetLastError()); + return 1; } CloseHandle(ProcessInformation.hThread); @@ -253,7 +283,7 @@ int main(int argc, char *argv[]) switch (ExitCode) { case WAIT_FAILED: - fprintf(stderr, "Wait for child failed, error %lu\n", GetLastError()); + Error("Wait for child failed (error %lu)\n", GetLastError()); break; case WAIT_TIMEOUT: @@ -261,15 +291,15 @@ int main(int argc, char *argv[]) break; default: - fprintf(stderr, "Unexpected return value %lu from wait for child\n", ExitCode); + Error("Unexpected return value %lu from wait for child\n", ExitCode); break; } if (!TerminateProcess(ProcessInformation.hProcess, 257)) - fprintf(stderr, "TerminateProcess failed, error %lu\n", GetLastError()); + Error("TerminateProcess failed (error %lu)\n", GetLastError()); } else if (!Skips && !GetExitCodeProcess(ProcessInformation.hProcess, &ExitCode)) { - fprintf(stderr, "Can't get child exit code, error %lu\n", GetLastError()); + Error("Could not get the child exit code (error %lu)\n", GetLastError()); ExitCode = 259; } CloseHandle(ProcessInformation.hProcess); -- 2.20.1

1 0

[tools] testbot/LibvirtTool: Always shut down for '-off' snapshots.
by Francois Gouget March 16, 2021

March 16, 2021

Snapshots with a name ending in '-off' request that the VM be cleanly shut down if possible rather than summarily powered off. So check the domain's current snapshot and do a clean shutdown before powering off for every operation, including checkoff, monitor and revert. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 118 ++++++++++++++++++++++--------------- 1 file changed, 72 insertions(+), 46 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index f135b9b51..c4dbffbaa 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -257,6 +257,66 @@ sub ChangeStatus($$;$) return 0; } +sub ShutDown() +{ + my $Domain = $VM->GetDomain(); + my $CurrentSnapshot = $Domain->GetSnapshotName(); + if (!defined $CurrentSnapshot or $CurrentSnapshot !~ /-off$/ or + !$Domain->IsPoweredOn()) + { + return 1; + } + + Debug(Elapsed($Start), " Performing a clean shutdown of $VMKey $CurrentSnapshot\n"); + LogMsg "Performing a clean shutdown of $VMKey $CurrentSnapshot\n"; + + # Use SetTime() to detect if privileged operations are allowed. + my $TA = $VM->GetAgent(); + if (!$TA->SetTime()) + { + # Not a fatal error. Try the next port in case the VM runs a privileged + # TestAgentd daemon there. + $TA->Disconnect(); + $TA = $VM->GetAgent(1); + if (!$TA->SetTime()) + { + Error "Unable to get a privileged TestAgent: ". $TA->GetLastError() ."\n"; + $TA->Disconnect(); + return 0; + } + } + + my $Success = 1; + my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ? + ["shutdown.exe", "/p", "/d", "00:00"] : + ["/sbin/shutdown", "--poweroff", "now"]; + Debug(Elapsed($Start), " Running @$Cmd\n"); + if (!$TA->Run($Cmd, 0)) + { + Error "Could not run @$Cmd: ". $TA->GetLastError() ."\n"; + $Success = 0; + } + else + { + Debug(Elapsed($Start), " Waiting for the VM to power off\n"); + my $Deadline = time() + $WaitForShutdown; + while ($Domain->IsPoweredOn()) + { + if (time() >= $Deadline) + { + Error "Timed out waiting for $VMKey to perform a clean shutdown. Forcefully shutting down now...\n"; + $Success = 0; + last; + } + sleep(1); + } + } + $TA->Disconnect(); + Debug(Elapsed($Start), " Successfully shut down $VMKey\n"); + LogMsg "Successfully shut down $VMKey\n"; + return $Success; +} + sub Monitor() { # Still try recovering the VM in case of repeated errors, but space out @@ -301,6 +361,9 @@ sub Monitor() my $IsReady = $VM->GetDomain()->IsReady(); if ($IsReady and $VM->GetDomain()->IsPoweredOn()) { + # Try to perform a clean shutdown if requested + ShutDown(); + my $ErrMessage = $VM->GetDomain()->PowerOff(); if (defined $ErrMessage) { @@ -324,55 +387,12 @@ sub Monitor() sub PowerOff() { - my $Domain = $VM->GetDomain(); - if ($VM->IdleSnapshot =~ /-off$/ and $Domain->IsPoweredOn()) - { - # Attempt to perform a clean shutdown. - # Use SetTime() to detect if privileged operations are allowed. - my $TA = $VM->GetAgent(); - if (!$TA->SetTime()) - { - # Not a fatal error. Try the next port in case the VM runs a privileged - # TestAgentd daemon there. - $TA->Disconnect(); - $TA = $VM->GetAgent(1); - if (!$TA->SetTime()) - { - Error "Unable to get a privileged TestAgent: ". $TA->GetLastError() ."\n"; - $TA->Disconnect(); - $TA = undef; - } - } - if ($TA) - { - my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ? - ["shutdown.exe", "/p", "/d", "00:00"] : - ["/sbin/shutdown", "--poweroff", "now"]; - Debug(Elapsed($Start), " Running @$Cmd\n"); - if (!$TA->Run($Cmd, 0)) - { - Error "Could not run @$Cmd: ". $TA->GetLastError() ."\n"; - } - else - { - Debug(Elapsed($Start), " Waiting for the VM to power off\n"); - my $Deadline = time() + $WaitForShutdown; - while ($Domain->IsPoweredOn()) - { - if (time() >= $Deadline) - { - Error "Timed out waiting for ". $VM->Name ." to perform a clean shutdown. Forcefully shutting down now...\n"; - last; - } - sleep(1); - } - } - } - } + # Try to perform a clean shutdown if requested + ShutDown(); # Power off the VM no matter what its initial status is $CurrentStatus = $VM->Status; - my $ErrMessage = $Domain->PowerOff(); + my $ErrMessage = $VM->GetDomain()->PowerOff(); FatalError("$ErrMessage\n") if (defined $ErrMessage); return ChangeStatus(undef, "off", "done"); @@ -407,6 +427,9 @@ sub CheckOff() FatalError("$ErrMessage\n") if (defined $ErrMessage); if ($SnapshotName eq $VM->IdleSnapshot) { + # Try to perform a clean shutdown if requested + ShutDown(); + my $ErrMessage = $VM->GetDomain()->PowerOff(); FatalError("$ErrMessage\n") if (defined $ErrMessage); } @@ -584,6 +607,9 @@ sub Revert() $VM->Save(); } + # Before reverting, try to perform a clean shutdown if requested + ShutDown(); + # Revert the VM (and power it on if necessary) Debug(Elapsed($Start), " Reverting $VMKey to $DomainSnapshot\n"); my ($ErrMessage, $Booting) = $Domain->RevertToSnapshot($DomainSnapshot); -- 2.20.1

1 0

[tools] testbot/LogUtils: Highlight the dll 'version' errors.
by Francois Gouget March 16, 2021

March 16, 2021

WineTest replaces the dll version information with an error message when it cannot get that information, or if the dll is missing an entry point needed by the test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index eced000cb..840a5526a 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -325,7 +325,9 @@ sub GetReportLineCategory($) { return "skip"; } - if ($Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start / or + if ($Line =~ /^ \w+=dll is (?:missing|native|a stub)/ or + $Line =~ /^ \w+=(?:load error|version error \d+|version not (?:found|present))$/ or + $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start / or $Line =~ /: this is the last test seen before the exception/) { return "info"; -- 2.20.1

1 0

[PATCH] winetest: Don't parse the test list if 'test --list' failed.
by Francois Gouget March 16, 2021

March 16, 2021

Any non-zero exit code is grounds for ignoring the 'test --list' output. This also causes get_subtests() to return the actual process exit code rather than a generic internal error when it fails to parse the test list. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> ---- The better diagnostic error code may help further diagnosing bug 48061. * WineTest: get_subtests() fails randomly https://bugs.winehq.org/show_bug.cgi?id=48061 --- programs/winetest/main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index e203b781dc8..2e5fdc6ab8c 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -724,9 +724,12 @@ get_subtests (const char *tempdir, struct wine_test *test, LPSTR res_name) } heap_free (cmd); - if (status == -2) + if (status) { - report (R_ERROR, "Cannot run %s error %u", test->exename, err); + if (status == -2) + report (R_ERROR, "Cannot run %s error %u", test->exename, err); + else + err = status; CloseHandle( subfile ); goto quit; } -- 2.20.1

1 0

[PATCH] dwrite: Fix the case of FreeType in a comment.
by Francois Gouget March 16, 2021

March 16, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index a74c9712b6a..6e5624c622a 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -6484,7 +6484,7 @@ BOOL opentype_has_kerning_pairs(struct dwrite_fontface *fontface) count = GET_BE_WORD(header->table_count); offset = sizeof(*header); - /* Freetype limits table count this way. */ + /* FreeType limits table count this way. */ count = min(count, 32); /* Check for presence of format 0 subtable with horizontal coverage. */ -- 2.20.1

1 0

[PATCH] msi: Fix building the fusion filename.
by Hans Leidekker March 16, 2021

March 16, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50809 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 05f122fb545..bf93f3e9afe 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -534,7 +534,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) if (!(filename = msi_alloc(len * sizeof(WCHAR)))) return NULL; lstrcpyW(filename, path); - lstrcpyW(filename, L"\\"); + lstrcatW(filename, L"\\"); lstrcatW(filename, L"fusion.dll"); if (GetFileAttributesW(filename) != INVALID_FILE_ATTRIBUTES) { -- 2.30.2

1 0

[PATCH] ntdll: Fall back to reading /dev/urandom if getrandom() is not supported.
by Hans Leidekker March 16, 2021

March 16, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50168 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ntdll/unix/system.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 48321957fb8..6fa71ddfb91 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2036,6 +2036,22 @@ static void get_timezone_info( RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi ) } +static void read_dev_urandom( void *buf, ULONG len ) +{ + int fd = open( "/dev/urandom", O_RDONLY ); + if (fd != -1) + { + int ret; + do + { + ret = read( fd, buf, len ); + } + while (ret == -1 && errno == EINTR); + close( fd ); + } + else WARN( "can't open /dev/urandom\n" ); +} + /****************************************************************************** * NtQuerySystemInformation (NTDLL.@) */ @@ -2525,19 +2541,10 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, ret = getrandom( info, len, 0 ); } while (ret == -1 && errno == EINTR); + + if (ret == -1 && errno == ENOSYS) read_dev_urandom( info, len ); #else - int fd = open( "/dev/urandom", O_RDONLY ); - if (fd != -1) - { - int ret; - do - { - ret = read( fd, info, len ); - } - while (ret == -1 && errno == EINTR); - close( fd ); - } - else WARN( "can't open /dev/urandom\n" ); + read_dev_urandom( info, len ); #endif } } -- 2.30.2

1 0