March 2018 - Wine-Devel - list.winehq.org

[PATCH 1/1] winex11.drv: Fix QQ and TIM deadlocked
by Wei Xie March 27, 2018

March 27, 2018

X11DRV_WindowMessage handle WM_X11DRV_SET_CURSOR message will owner win_data_section and wait loader_section(call stack set_window_cursor ->create_cursor->create_xcursor_system_cursor->GetModuleHandleW), if load FlashControl.dll in other thread(thread B), thread B will CreateWindow in process_attach entry, so in thread B owner loader_section and wait win_data_section. This situation will caused deadlocked

1 0

[PATCH] testbot/web: Tweak VMsList::OnItemAction() to save the Item directly.
by Francois Gouget March 27, 2018

March 27, 2018

OnItemAction() is called on each selected Item and should only operate on the specified Item rather than blindly saving all the Items in the Collection. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/VMsList.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index 652fc8e1b..500442b5b 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -58,7 +58,7 @@ sub OnItemAction($$$$) if ($Action eq "Delete") { $Item->Role("deleted"); - my ($ErrKey, $ErrProperty, $ErrMessage) = $self->{Collection}->Save(); + my ($ErrProperty, $ErrMessage) = $Item->Save(); return ! defined($ErrMessage); } -- 2.16.2

1 0

[PATCH] testbot/web: Tweak VMDetails.pl to save the Item directly.
by Francois Gouget March 27, 2018

March 27, 2018

This avoids depending on whether Items retrieved with GetItem() are stored in the Collection or not. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/VMDetails.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 7b562a746..11cec4cf1 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -58,8 +58,7 @@ sub Save($) } } - my $ErrKey; - ($ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); + ($self->{ErrField}, $self->{ErrMessage}) = $self->{Item}->Save(); return ! defined($self->{ErrMessage}); } -- 2.16.2

1 0

[PATCH] testbot/testagentd: Fix the upgrade RPC.
by Francois Gouget March 27, 2018

March 27, 2018

On Windows it used to work only once and leave the batch script behind. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Now that it works right it could be used to at least partially automate some VM updates. testbot/src/testagentd/platform.h | 9 ++- testbot/src/testagentd/platform_unix.c | 62 +++++++++++++++------ testbot/src/testagentd/platform_windows.c | 92 ++++++++++++++++++++++++------- testbot/src/testagentd/testagentd.c | 31 ++++------- 4 files changed, 130 insertions(+), 64 deletions(-) diff --git a/testbot/src/testagentd/platform.h b/testbot/src/testagentd/platform.h index 98dfe394c..06882dedc 100644 --- a/testbot/src/testagentd/platform.h +++ b/testbot/src/testagentd/platform.h @@ -96,12 +96,11 @@ int platform_rmchildproc(SOCKET client, uint64_t pid); */ int platform_settime(uint64_t epoch, uint32_t leeway); -/* Creates a script to be invoked to upgrade the current server. - * The current server is responsible for starting the script and quickly exit. - * The script will wait a bit, replace the server file and restart the server - * with the same arguments as the original server. +/* Replaces server file and restarts the server. + * Returns non-zero if successful, which will let the caller know to complete + * the current RPC and cleanly exit. Returns 0 otherwise. */ -int platform_upgrade_script(const char* script, const char* tmpserver, char** argv); +int platform_upgrade(const char* tmpserver, char** argv); /* Called when the message has been dismissed by the user. */ diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index fbaa995b0..7a3a8f8e0 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -239,34 +239,60 @@ int platform_settime(uint64_t epoch, uint32_t leeway) return 1; } -int platform_upgrade_script(const char* script, const char* tmpserver, char** argv) + +int platform_upgrade(const char* tmpserver, char** argv) { - char** arg; - FILE* fh; + static const char* oldserver = "testagentd.old"; + int pipefds[2]; + pid_t pid; - fh = fopen(script, "w"); - if (!fh) + if (rename(argv[0], oldserver)) { - set_status(ST_ERROR, "unable to open '%s' for writing: %s", script, strerror(errno)); + set_status(ST_ERROR, "unable to move the current server file out of the way: %s", strerror(errno)); return 0; } - /* Allow time for the server to exit */ - fprintf(fh, "#!/bin/sh\n"); - fprintf(fh, "sleep 1\n"); - fprintf(fh, "mv %s %s\n", tmpserver, argv[0]); - arg = argv; - while (*arg) + + if (rename(tmpserver, argv[0])) { - fprintf(fh, "'%s' ", *arg); - arg++; + set_status(ST_ERROR, "unable to move the currentnew server file into place: %s", strerror(errno)); + rename(oldserver, argv[0]); + return 0; } - fprintf(fh, "\n"); - fclose(fh); - if (chmod(script, S_IRUSR | S_IWUSR | S_IXUSR) < 0) + if (pipe(pipefds)) { - set_status(ST_ERROR, "could not make '%s' executable: %s", script, strerror(errno)); + set_status(ST_ERROR, "could not synchronize with the new process: %s", strerror(errno)); + rename(oldserver, argv[0]); return 0; } + + pid = fork(); + if (pid < 0) + { + set_status(ST_ERROR, "unable to start the new server: %s", strerror(errno)); + close(pipefds[0]); + close(pipefds[1]); + rename(oldserver, argv[0]); + return 0; + } + + unlink(oldserver); + if (!pid) + { + /* The child process is responsible for cleanly closing the connection + * to the client. + */ + close(pipefds[0]); + return 1; + } + close(pipefds[1]); + + /* Wait for the read to fail which means the child exited and released the + * TestAgentd port. + */ + read(pipefds[0], &pid, 1); + close(pipefds[0]); + + execvp(argv[0], argv); return 1; } diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index 5c55b2004..bb52a0241 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -280,36 +280,68 @@ int platform_settime(uint64_t epoch, uint32_t leeway) } -int platform_upgrade_script(const char* script, const char* tmpserver, char** argv) +char* get_server_filename(int old) { - char testagentd[MAX_PATH]; + char filename[MAX_PATH]; DWORD rc; - FILE* fh; - rc = GetModuleFileName(NULL, testagentd, sizeof(testagentd)); - if (!rc || rc == sizeof(testagentd)) + rc = GetModuleFileName(NULL, filename, sizeof(filename)); + if (!rc || rc == sizeof(filename)) + return NULL; + + if (old) { - set_status(ST_ERROR, "unable to get the current process filename (%lu, le=%lu)", rc, GetLastError()); - return 0; + if (rc >= sizeof(filename) - 5) + return NULL; + strcat(filename, ".old"); } + return strdup(filename); +} + +int platform_upgrade(const char* tmpserver, char** argv) +{ + char *testagentd = NULL, *oldtestagentd = NULL; + STARTUPINFO si; + PROCESS_INFORMATION pi; + int success = 0; - fh = fopen(script, "w"); - if (!fh) + testagentd = get_server_filename(0); + oldtestagentd = get_server_filename(1); + if (!testagentd || !oldtestagentd) { - set_status(ST_ERROR, "unable to open '%s' for writing: %s", script, strerror(errno)); - return 0; + set_status(ST_ERROR, "unable to get the process filenames (le=%lu)", GetLastError()); + goto done; } - /* Allow time for the server to exit */ - fprintf(fh, "ping -n 1 -w 1000 1.1.1.1 >/nul\r\n"); - /* Note that preserving the server filename is necessary and sufficient - * in order to get through the Windows firewall. - */ - fprintf(fh, "copy /y \"%s\" \"%s\"\r\n", tmpserver, testagentd); - fprintf(fh, "del \"%s\"\r\n", tmpserver); - fprintf(fh, "%s\r\n", GetCommandLine()); - fclose(fh); - return 1; + if (!MoveFile(testagentd, oldtestagentd)) + { + set_status(ST_ERROR, "unable to move the current server file out of the way (le=%lu)", GetLastError()); + goto done; + } + if (!MoveFile(tmpserver, testagentd)) + { + set_status(ST_ERROR, "unable to move the new server file in place (le=%lu)", GetLastError()); + MoveFile(oldtestagentd, testagentd); + goto done; + } + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + if (!CreateProcessA(testagentd, GetCommandLineA(), NULL, NULL, TRUE, + CREATE_NEW_CONSOLE, NULL, NULL, &si, &pi)) + { + set_status(ST_ERROR, "could not run '%s': %lu", GetCommandLineA(), GetLastError()); + MoveFile(oldtestagentd, testagentd); + goto done; + } + + /* The new server will delete the old server file on startup */ + success = 1; + + done: + free(testagentd); + free(oldtestagentd); + return success; } struct msg_thread_t @@ -488,11 +520,29 @@ void platform_detach_console(void) int platform_init(void) { + char *oldtestagentd; HMODULE hdll; WORD wVersionRequested; WSADATA wsaData; int rc; + /* Delete the old server file if any */ + oldtestagentd = get_server_filename(1); + if (oldtestagentd) + { + /* This also serves to ensure the old server has released the port + * before we attempt to open our own. + */ + do + { + if (!DeleteFileA(oldtestagentd)) + Sleep(500); + } + while (GetLastError() == ERROR_ACCESS_DENIED); + free(oldtestagentd); + } + + wVersionRequested = MAKEWORD(2, 2); rc = WSAStartup(wVersionRequested, &wsaData); if (rc) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 79016c067..b4a26fc58 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -1078,7 +1078,6 @@ static void do_setproperty(SOCKET client) static void do_upgrade(SOCKET client) { static const char *filename = "testagentd.tmp"; - static const char* upgrade_script = "./replace.bat"; int fd, success; if (!expect_list_size(client, 1) @@ -1103,34 +1102,26 @@ static void do_upgrade(SOCKET client) close(fd); } - if (!success) - unlink(filename); - else - success = platform_upgrade_script(upgrade_script, filename, server_argv); + if (success) + success = platform_upgrade(filename, server_argv); if (success) { - char* args[2]; - char* redirects[3] = {"", "", ""}; - send_list_size(client, 0); - args[0] = strdup(upgrade_script); - args[1] = NULL; - success = platform_run(args, RUN_DNT, redirects); - free(args[0]); - if (success) - { - /* Decrement the start count since this one is intentional */ - start_count--; - save_start_count(); + /* Decrement the start count since this one is intentional */ + start_count--; + save_start_count(); - broken = 1; - quit = 1; - } + /* Tell the main loop to quit */ + broken = 1; + quit = 1; } else + { send_error(client); + unlink(filename); + } } static void do_getcwd(SOCKET client) -- 2.16.2

1 0

[PATCH] testbot/web: Import WineTestBot::Utils for the statistics page.
by Francois Gouget March 27, 2018

March 27, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The statistics page got broken by the DurationToString() patch (ee3483d4b8b0). This fixes it. testbot/web/Stats.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 146740789..90f546397 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -26,6 +26,7 @@ use ObjectModel::Collection; use WineTestBot::Config; use WineTestBot::Activity; use WineTestBot::Log; +use WineTestBot::Utils; use WineTestBot::VMs; @StatsPage::ISA = qw(ObjectModel::CGI::Page); -- 2.16.2

1 0

[PATCH 1/2] ntdll: Set proper ExceptionInformation[0] for x86_64 exceptions.
by Zebediah Figura March 26, 2018

March 26, 2018

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index efbcc6e..952b1a4 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2884,7 +2884,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) case TRAP_x86_PAGEFLT: /* Page fault */ rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; rec->NumberParameters = 2; - rec->ExceptionInformation[0] = (ERROR_sig(ucontext) & 2) != 0; + rec->ExceptionInformation[0] = (ERROR_sig(ucontext) >> 1) & 0x09; rec->ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; break; case TRAP_x86_ALIGNFLT: /* Alignment check exception */ -- 2.7.4

1 1

[PATCH] ntoskrnl.exe: Implement _chkstk
by Alistair Leslie-Hughes March 26, 2018

March 26, 2018

These are just copied from ntdll. Fixes https://bugs.winehq.org/show_bug.cgi?id=44811 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 30 ++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 ++ 2 files changed, 32 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d8277a9..e3d72ba 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3373,3 +3373,33 @@ INT __cdecl NTOSKRNL_wcsncmp( LPCWSTR str1, LPCWSTR str2, INT n ) { return strncmpW( str1, str2, n ); } + + +#ifdef __x86_64__ +/************************************************************************** + * __chkstk (NTOSKRNL.@) + * + * Supposed to touch all the stack pages, but we shouldn't need that. + */ +__ASM_GLOBAL_FUNC( __chkstk, "ret" ); + +#elif defined(__i386__) +/************************************************************************** + * _chkstk (NTOSKRNL.@) + */ +__ASM_STDCALL_FUNC( _chkstk, 0, + "negl %eax\n\t" + "addl %esp,%eax\n\t" + "xchgl %esp,%eax\n\t" + "movl 0(%eax),%eax\n\t" /* copy return address from old location */ + "movl %eax,0(%esp)\n\t" + "ret" ) +#elif defined(__arm__) +/************************************************************************** + * __chkstk (NTDLL.@) + * + * Incoming r4 contains words to allocate, converting to bytes then return + */ +__ASM_GLOBAL_FUNC( __chkstk, "lsl r4, r4, #2\n\t" + "bx lr" ) +#endif diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index dca1404..8265f1e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1416,6 +1416,8 @@ @ stub _aulldvrm @ stdcall -private -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -private -arch=i386 -ret64 _aullshr(int64 long) +@ stdcall -private -arch=i386 -norelay _chkstk() +@ stdcall -private -arch=arm,x86_64 -norelay __chkstk() @ cdecl -private -arch=i386 _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2 @ cdecl -private -arch=i386 _except_handler3(ptr ptr ptr ptr) msvcrt._except_handler3 @ cdecl -private -arch=i386 _global_unwind2(ptr) msvcrt._global_unwind2 -- 1.9.1

1 0

Re: kernel32: Rename Czech Republic to Czechia
by wylda＠volny.cz March 26, 2018

March 26, 2018

______________________________________________________________ > Od: Nikolay Sivov <bunglehead(a)gmail.com> > Komu: wine-devel(a)winehq.org > Datum: 24.03.2018 19:38 > Předmět: Re: kernel32: Rename Czech Republic to Czechia > >This looks like something to avoid until it becomes necessary. > > Ufff, many thanks Nikolay ;-)) Win10 still mentions Czech Republic and hopefully will stay there forever. W.

4 4

[PATCH 2/2 v2] msvcrt: Implement _atoi64_l.
by Piotr Caban March 26, 2018

March 26, 2018

From: Hua Meng <161220092(a)smail.nju.edu.cn> Signed-off-by: Hua Meng <161220092(a)smail.nju.edu.cn> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> — .../api-ms-win-crt-convert-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-)

1 0

[PATCH 1/2 v2] msvcrt: Implement _atol_l.
by Piotr Caban March 26, 2018

March 26, 2018

From: Hua Meng <161220092(a)smail.nju.edu.cn> Signed-off-by: Hua Meng <161220092(a)smail.nju.edu.cn> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> — v2: whitespace fix .../api-ms-win-crt-convert-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 17 +++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 26 insertions(+), 9 deletions(-)

1 0