wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Francois Gouget : testbot/TestLauncher: Show the tool name in error messages.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: tools Branch: master Commit: 856584a4acfb31e14d3ce770114ce0395317405a URL: https://source.winehq.org/git/tools.git/?a=commit;h=856584a4acfb31e14d3ce77… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 16 12:14:03 2021 +0100 testbot/TestLauncher: Show the tool name in error messages. Format the error messages so that they are easily recognized as such. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 7b58c9a..5ff8060 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. */ @@ -112,12 +134,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; @@ -134,8 +164,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 @@ -146,9 +176,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) @@ -171,8 +201,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] = '"'; @@ -193,7 +223,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(); @@ -214,8 +244,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); @@ -249,7 +279,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: @@ -257,15 +287,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);

1 0

Francois Gouget : testbot/LibvirtTool: Always shut down for '-off' snapshots.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: tools Branch: master Commit: b22f79a59d9a04f70a9a5c9b66570a85927cf072 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b22f79a59d9a04f70a9a5c9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 16 12:13:25 2021 +0100 testbot/LibvirtTool: Always shut down for '-off' snapshots. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 f135b9b..c4dbffb 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);

1 0

Francois Gouget : testbot/LogUtils: Highlight the dll 'version' errors.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: tools Branch: master Commit: 72e55a7b302cdc878d4c986d94647d6641885a79 URL: https://source.winehq.org/git/tools.git/?a=commit;h=72e55a7b302cdc878d4c986… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 16 12:13:07 2021 +0100 testbot/LogUtils: Highlight the dll 'version' errors. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 eced000..840a552 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";

1 0

Adam Gashlin : advapi32: Don't revoke ACCESS_DENIED_ACE.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 23ffd0a7986421958c23cffce138afa389209920 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23ffd0a7986421958c23cffc… Author: Adam Gashlin <agashlin(a)gmail.com> Date: Mon Mar 1 21:18:01 2021 -0800 advapi32: Don't revoke ACCESS_DENIED_ACE. REVOKE_ACCESS is only documented to remove ACCESS_ALLOWED_ACE and SYSTEM_AUDIT_ACE. Signed-off-by: Adam Gashlin <agashlin(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 3 +-- dlls/advapi32/tests/security.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 9f80a846966..6246cd21a62 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2314,8 +2314,7 @@ DWORD WINAPI SetEntriesInAclW( ULONG count, PEXPLICIT_ACCESSW pEntries, add = FALSE; break; case ACCESS_DENIED_ACE_TYPE: - if (EqualSid(ppsid[j], &((ACCESS_DENIED_ACE *)old_ace_header)->SidStart)) - add = FALSE; + /* REVOKE_ACCESS does not affect ACCESS_DENIED_ACE. */ break; case SYSTEM_AUDIT_ACE_TYPE: if (EqualSid(ppsid[j], &((SYSTEM_AUDIT_ACE *)old_ace_header)->SidStart)) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a8c1a80e419..ce9c26d238e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -7437,6 +7437,32 @@ static void test_GetExplicitEntriesFromAclW(void) ok(access2 == NULL, "access2 was not NULL\n"); LocalFree(new_acl); + /* Make the ACL both Allow and Deny Everyone. */ + res = AddAccessAllowedAce(old_acl, ACL_REVISION, KEY_READ, everyone_sid); + ok(res, "AddAccessAllowedAce failed with error %d\n", GetLastError()); + res = AddAccessDeniedAce(old_acl, ACL_REVISION, KEY_WRITE, everyone_sid); + ok(res, "AddAccessDeniedAce failed with error %d\n", GetLastError()); + /* Revoke Everyone. */ + access.Trustee.ptstrName = everyone_sid; + access.Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP; + access.grfAccessPermissions = 0; + new_acl = NULL; + res = pSetEntriesInAclW(1, &access, old_acl, &new_acl); + ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); + ok(new_acl != NULL, "returned acl was NULL\n"); + /* Deny Everyone should remain (along with Grant Users from earlier). */ + access2 = NULL; + res = pGetExplicitEntriesFromAclW(new_acl, &count, &access2); + ok(res == ERROR_SUCCESS, "GetExplicitEntriesFromAclW failed with error %d\n", GetLastError()); + ok(count == 2, "Expected count == 2, got %d\n", count); + ok(access2[0].grfAccessMode == GRANT_ACCESS, "Expected GRANT_ACCESS, got %d\n", access2[0].grfAccessMode); + ok(access2[0].grfAccessPermissions == KEY_READ , "Expected KEY_READ, got %d\n", access2[0].grfAccessPermissions); + ok(EqualSid(access2[0].Trustee.ptstrName, users_sid), "Expected equal SIDs\n"); + ok(access2[1].grfAccessMode == DENY_ACCESS, "Expected DENY_ACCESS, got %d\n", access2[1].grfAccessMode); + ok(access2[1].grfAccessPermissions == KEY_WRITE, "Expected KEY_WRITE, got %d\n", access2[1].grfAccessPermissions); + ok(EqualSid(access2[1].Trustee.ptstrName, everyone_sid), "Expected equal SIDs\n"); + LocalFree(access2); + FreeSid(users_sid); FreeSid(everyone_sid); HeapFree(GetProcessHeap(), 0, old_acl);

1 0

Torge Matthies : winepulse.drv: Make timer delay more accurate.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 6dd96842fed8ef3b1627a41f58eaec4f897a3ae0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dd96842fed8ef3b1627a41f… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Sat Mar 6 02:27:14 2021 +0100 winepulse.drv: Make timer delay more accurate. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 4609b2851ed..10b01868a9d 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -38,6 +38,7 @@ #include "winbase.h" #include "winnls.h" #include "winreg.h" +#include "winternl.h" #include "wine/debug.h" #include "wine/unicode.h" #include "wine/list.h" @@ -1021,14 +1022,14 @@ static void pulse_read(ACImpl *This) static DWORD WINAPI pulse_timer_cb(void *user) { - DWORD delay; + LARGE_INTEGER delay; UINT32 adv_bytes; ACImpl *This = user; int success; pa_operation *o; pthread_mutex_lock(&pulse_lock); - delay = This->mmdev_period_usec / 1000; + delay.QuadPart = -This->mmdev_period_usec * 10; pa_stream_get_time(This->stream, &This->last_time); pthread_mutex_unlock(&pulse_lock); @@ -1036,11 +1037,11 @@ static DWORD WINAPI pulse_timer_cb(void *user) pa_usec_t now, adv_usec = 0; int err; - Sleep(delay); + NtDelayExecution(FALSE, &delay); pthread_mutex_lock(&pulse_lock); - delay = This->mmdev_period_usec / 1000; + delay.QuadPart = -This->mmdev_period_usec * 10; o = pa_stream_update_timing_info(This->stream, pulse_op_cb, &success); if (o) @@ -1076,7 +1077,7 @@ static DWORD WINAPI pulse_timer_cb(void *user) else if(adjust < -((INT32)(This->mmdev_period_usec / 2))) adjust = -1 * This->mmdev_period_usec / 2; - delay = (This->mmdev_period_usec + adjust) / 1000; + delay.QuadPart = -(This->mmdev_period_usec + adjust) * 10; This->last_time += This->mmdev_period_usec; } @@ -1094,16 +1095,16 @@ static DWORD WINAPI pulse_timer_cb(void *user) } }else{ This->last_time = now; - delay = This->mmdev_period_usec / 1000; + delay.QuadPart = -This->mmdev_period_usec * 10; } } if (This->event) SetEvent(This->event); - TRACE("%p after update, adv usec: %d, held: %u, delay: %u\n", + TRACE("%p after update, adv usec: %d, held: %u, delay usec: %u\n", This, (int)adv_usec, - (int)(This->held_bytes/ pa_frame_size(&This->ss)), delay); + (int)(This->held_bytes/ pa_frame_size(&This->ss)), (unsigned int)(-delay.QuadPart / 10)); pthread_mutex_unlock(&pulse_lock); }

1 0

Torge Matthies : winepulse.drv: Make timer thread time-critical.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: b07c33cac4538b06a276d4cf6cc85487d31041e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b07c33cac4538b06a276d4cf… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Sat Mar 6 02:27:13 2021 +0100 winepulse.drv: Make timer thread time-critical. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 417067f0bf8..4609b2851ed 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -2045,8 +2045,10 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) This->started = TRUE; This->just_started = TRUE; - if(!This->timer) + if(!This->timer) { This->timer = CreateThread(NULL, 0, pulse_timer_cb, This, 0, NULL); + SetThreadPriority(This->timer, THREAD_PRIORITY_TIME_CRITICAL); + } } pthread_mutex_unlock(&pulse_lock); return hr;

1 0

Francois Gouget : winetest: Show more detailed version error information.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 18c12c6dbb9946bb7eebf9dda2541c0acce53cef URL: https://source.winehq.org/git/wine.git/?a=commit;h=18c12c6dbb9946bb7eebf9dd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 15 19:28:48 2021 +0100 winetest: Show more detailed version error information. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index b0b6ceff88b..e203b781dc8 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -129,14 +129,14 @@ static char * get_file_version(char * file_name) pFixedVersionInfo->dwFileVersionLS >> 16, pFixedVersionInfo->dwFileVersionLS & 0xffff); } else - sprintf(version, "version not available"); + sprintf(version, "version not found"); } else - sprintf(version, "unknown"); + sprintf(version, "version error %u", GetLastError()); heap_free(data); } else - sprintf(version, "failed"); + sprintf(version, "version error %u", ERROR_OUTOFMEMORY); } else - sprintf(version, "version not available"); + sprintf(version, "version not present"); return version; }

1 0

Francois Gouget : winetest: Simplify the 'dll is native' error message.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 21e9d51b366148d8bcc4e701dd1fa445315178da URL: https://source.winehq.org/git/wine.git/?a=commit;h=21e9d51b366148d8bcc4e701… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 15 19:28:40 2021 +0100 winetest: Simplify the 'dll is native' error message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 408e1b3c706..b0b6ceff88b 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -957,7 +957,7 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP } else if (is_native_dll(dll)) { - xprintf (" %s=load error Configured as native\n", dllname); + xprintf (" %s=dll is native\n", dllname); nr_native_dlls++; run = FALSE; }

1 0

Jiangyi Chen : ws2_32: Add a missing break.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 37b7d573b2832c5415220acb2ab33f2c8ab26fc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37b7d573b2832c5415220acb… Author: Jiangyi Chen <chenjiangyi(a)uniontech.com> Date: Mon Mar 15 11:24:02 2021 +0800 ws2_32: Add a missing break. Signed-off-by: Jiangyi Chen <chenjiangyi(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6e783f87ee7..28b14e71c9c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7484,6 +7484,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, if (!af) af = supported_protocols[i].iAddressFamily; if (!type) type = supported_protocols[i].iSocketType; if (!protocol) protocol = supported_protocols[i].iProtocol; + break; } }

1 0

Rémi Bernon : include: Add KSHARED_USER_DATA QpcData details and flags.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 3b874440acb7858953a4a0b59cfc39196cfed7e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b874440acb7858953a4a0b5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 10 12:22:34 2021 +0100 include: Add KSHARED_USER_DATA QpcData details and flags. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/wdm.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index c0b97e243aa..3b9af7d52b2 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1292,12 +1292,26 @@ typedef struct _KUSER_SHARED_DATA { volatile ULONGLONG QpcBias; /* 0x3b8 */ ULONG ActiveProcessorCount; /* 0x3c0 */ volatile UCHAR ActiveGroupCount; /* 0x3c4 */ - USHORT QpcData; /* 0x3c6 */ + union { + USHORT QpcData; /* 0x3c6 */ + struct { + UCHAR volatile QpcBypassEnabled; + UCHAR QpcShift; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME3; LARGE_INTEGER TimeZoneBiasEffectiveStart; /* 0x3c8 */ LARGE_INTEGER TimeZoneBiasEffectiveEnd; /* 0x3d0 */ XSTATE_CONFIGURATION XState; /* 0x3d8 */ } KSHARED_USER_DATA, *PKSHARED_USER_DATA; +#define SHARED_GLOBAL_FLAGS_QPC_BYPASS_ENABLED 0x01 +#define SHARED_GLOBAL_FLAGS_QPC_BYPASS_USE_HV_PAGE 0x02 +#define SHARED_GLOBAL_FLAGS_QPC_BYPASS_DISABLE_32BIT 0x04 +#define SHARED_GLOBAL_FLAGS_QPC_BYPASS_USE_MFENCE 0x10 +#define SHARED_GLOBAL_FLAGS_QPC_BYPASS_USE_LFENCE 0x20 +#define SHARED_GLOBAL_FLAGS_QPC_BYPASS_A73_ERRATA 0x40 +#define SHARED_GLOBAL_FLAGS_QPC_BYPASS_USE_RDTSCP 0x80 + typedef enum _MEMORY_CACHING_TYPE { MmNonCached = 0, MmCached = 1,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2021