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

Francois Gouget : testbot/testagentd: Fix the upgrade RPC.
by Alexandre Julliard 27 Mar '18

27 Mar '18

Module: tools Branch: master Commit: 1a1a852cec0f714286c2801c8902308a95a8dab3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1a1a852cec0f714286c2801… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 27 03:44:36 2018 +0200 testbot/testagentd: Fix the upgrade RPC. On Windows it used to work only once and leave the batch script behind. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 98dfe39..06882de 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 fbaa995..7a3a8f8 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 5c55b20..bb52a02 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 79016c0..b4a26fc 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)

1 0

Francois Gouget : testbot/web: Tweak VMDetails.pl to save the Item directly.
by Alexandre Julliard 27 Mar '18

27 Mar '18

Module: tools Branch: master Commit: 71a9602bb6eab2b54e930080b8ef728064d6a664 URL: https://source.winehq.org/git/tools.git/?a=commit;h=71a9602bb6eab2b54e93008… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 27 03:45:29 2018 +0200 testbot/web: Tweak VMDetails.pl to save the Item directly. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 7b562a7..11cec4c 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}); }

1 0

Francois Gouget : testbot/web: Tweak VMsList::OnItemAction() to save the Item directly.
by Alexandre Julliard 27 Mar '18

27 Mar '18

Module: tools Branch: master Commit: 0343615675704471f9745b5a123c953b72319e64 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0343615675704471f9745b5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 27 03:45:37 2018 +0200 testbot/web: Tweak VMsList::OnItemAction() to save the Item directly. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 652fc8e..500442b 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); }

1 0

Hua Meng : msvcrt: Implement _atoi64_l.
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: e1c7a1f7ce03c1e69e008378e90523e85e1c6e8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1c7a1f7ce03c1e69e008378… Author: Hua Meng <161220092(a)smail.nju.edu.cn> Date: Mon Mar 26 21:20:48 2018 +0200 msvcrt: Implement _atoi64_l. Signed-off-by: Hua Meng <161220092(a)smail.nju.edu.cn> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../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(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index aa2f513..f8e1b8e 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -5,7 +5,7 @@ @ cdecl _atoflt(ptr str) ucrtbase._atoflt @ cdecl _atoflt_l(ptr str ptr) ucrtbase._atoflt_l @ cdecl -ret64 _atoi64(str) ucrtbase._atoi64 -@ stub _atoi64_l +@ cdecl _atoi64_l(str ptr) ucrtbase._atoi64_l @ cdecl _atoi_l(str ptr) ucrtbase._atoi_l @ cdecl _atol_l(str ptr) ucrtbase._atol_l @ cdecl _atoldbl(ptr str) ucrtbase._atoldbl diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 150f235..4426987 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -697,7 +697,7 @@ @ cdecl _atoflt(ptr str) MSVCRT__atoflt @ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l @ cdecl -ret64 _atoi64(str) ntdll._atoi64 -@ stub _atoi64_l +@ cdecl _atoi64_l(str ptr) MSVCRT__atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l @ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index d151480..27b3508 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1045,7 +1045,7 @@ @ cdecl _atoflt(ptr str) MSVCRT__atoflt @ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l @ cdecl -ret64 _atoi64(str) ntdll._atoi64 -@ stub _atoi64_l +@ cdecl _atoi64_l(str ptr) MSVCRT__atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l @ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 5b13600..254040a 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1035,7 +1035,7 @@ @ cdecl _atoflt(ptr str) MSVCRT__atoflt @ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l @ cdecl -ret64 _atoi64(str) ntdll._atoi64 -@ stub _atoi64_l +@ cdecl _atoi64_l(str ptr) MSVCRT__atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l @ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index c60160d..4739055 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1006,7 +1006,7 @@ @ cdecl _atoflt(ptr str) msvcr120._atoflt @ cdecl _atoflt_l(ptr str ptr) msvcr120._atoflt_l @ cdecl -ret64 _atoi64(str) msvcr120._atoi64 -@ stub _atoi64_l +@ cdecl _atoi64_l(str ptr) msvcr120._atoi64_l @ cdecl _atoi_l(str ptr) msvcr120._atoi_l @ cdecl _atol_l(str ptr) msvcr120._atol_l @ cdecl _atoldbl(ptr str) msvcr120._atoldbl diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 4c7177c..0df1f0a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -361,7 +361,7 @@ @ cdecl _atoflt(ptr str) MSVCRT__atoflt @ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l @ cdecl -ret64 _atoi64(str) ntdll._atoi64 -@ stub _atoi64_l +@ cdecl _atoi64_l(str ptr) MSVCRT__atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l @ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index da9e0ae..7238163 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -345,7 +345,7 @@ @ cdecl _atoflt(ptr str) MSVCRT__atoflt @ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l @ cdecl -ret64 _atoi64(str) ntdll._atoi64 -@ stub _atoi64_l +@ cdecl _atoi64_l(str ptr) MSVCRT__atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l @ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5fe9977..4dee1a6 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -332,7 +332,7 @@ @ cdecl _atof_l(str ptr) MSVCRT__atof_l @ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l @ cdecl -ret64 _atoi64(str) ntdll._atoi64 -# stub -ret64 _atoi64_l(str ptr) +@ cdecl _atoi64_l(str ptr) MSVCRT__atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l @ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 50c146f..c8cd390 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1069,6 +1069,14 @@ int CDECL MSVCRT_atoi(const char *str) #endif /****************************************************************** + * _atoi64_l (MSVCRT.@) + */ +__int64 CDECL MSVCRT__atoi64_l(const char *str, MSVCRT__locale_t locale) +{ + return MSVCRT_strtoi64_l(str, NULL, 10, locale); +} + +/****************************************************************** * _atol_l (MSVCRT.@) */ MSVCRT_long CDECL MSVCRT__atol_l(const char *str, MSVCRT__locale_t locale) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 63d040f..b12a1b1 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -196,7 +196,7 @@ @ cdecl _atoflt(ptr str) MSVCRT__atoflt @ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l @ cdecl -ret64 _atoi64(str) ntdll._atoi64 -@ stub _atoi64_l +@ cdecl _atoi64_l(str ptr) MSVCRT__atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l @ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl

1 0

Michael Müller : bcrypt: Implement importing of ECDSA keys.
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: 76b6c360fa7f3d6a0a14ed935075f5eb10f2f719 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76b6c360fa7f3d6a0a14ed93… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Mar 26 15:04:33 2018 +0200 bcrypt: Implement importing of ECDSA keys. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt.spec | 4 +- dlls/bcrypt/bcrypt_main.c | 173 +++++++++++++++++++++++++++++++++++++++++---- dlls/bcrypt/tests/bcrypt.c | 4 +- dlls/ncrypt/ncrypt.spec | 4 +- include/bcrypt.h | 2 + 5 files changed, 167 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=76b6c360fa7f3d6a0a14…

1 0

Michael Müller : bcrypt: Implement BCryptVerifySignature for ECDSA signatures.
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: 19e0f97f71c79fe52c2ace22e1f1b8c9e1416378 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19e0f97f71c79fe52c2ace22… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Mar 26 15:04:34 2018 +0200 bcrypt: Implement BCryptVerifySignature for ECDSA signatures. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 361 ++++++++++++++++++++++++++++++++++++++++++--- dlls/bcrypt/tests/bcrypt.c | 4 +- 2 files changed, 343 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=19e0f97f71c79fe52c2a…

1 0

Kimmo Myllyvirta : bcrypt: Initial implementation for RSA key import and signature verification.
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: b3c8723bd4f3b23f02a7460e1a228fb5855e3475 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3c8723bd4f3b23f02a7460e… Author: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Date: Mon Mar 26 15:04:35 2018 +0200 bcrypt: Initial implementation for RSA key import and signature verification. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 127 +++++++++++++++++++++++++++++++++++++++++----- include/bcrypt.h | 17 +++++++ 2 files changed, 130 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b3c8723bd4f3b23f02a7…

1 0

Kimmo Myllyvirta : bcrypt/tests: Add simple test for RSA.
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: 2154562d7ea767a3d4d87f45e7caf4d2a185af44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2154562d7ea767a3d4d87f45… Author: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Date: Mon Mar 26 15:04:36 2018 +0200 bcrypt/tests: Add simple test for RSA. Based on patch from Bernhard Übelacker. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 57d0488..7d59f6d 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1495,6 +1495,100 @@ static void test_ECDSA(void) pBCryptCloseAlgorithmProvider(alg, 0); } +static UCHAR rsaPublicBlob[] = +{ + 0x52, 0x53, 0x41, 0x31, 0x00, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0xad, 0x41, 0x09, 0xa2, 0x56, + 0x3a, 0x7b, 0x75, 0x4b, 0x72, 0x9b, 0x28, 0x72, 0x3b, 0xae, 0x9f, 0xd8, 0xa8, 0x25, 0x4a, 0x4c, + 0x19, 0xf5, 0xa6, 0xd0, 0x05, 0x1c, 0x59, 0x8f, 0xe3, 0xf3, 0x2d, 0x29, 0x47, 0xf8, 0x80, 0x25, + 0x25, 0x21, 0x58, 0xc2, 0xac, 0xa1, 0x9e, 0x93, 0x8e, 0x82, 0x6d, 0xd7, 0xf3, 0xe7, 0x8f, 0x0b, + 0xc0, 0x41, 0x85, 0x29, 0x3c, 0xf1, 0x0b, 0x2c, 0x5d, 0x49, 0xed, 0xb4, 0x30, 0x6e, 0x02, 0x15, + 0x4b, 0x9a, 0x08, 0x0d, 0xe1, 0x6f, 0xa8, 0xd3, 0x12, 0xab, 0x66, 0x48, 0x4d, 0xd9, 0x28, 0x03, + 0x6c, 0x9d, 0x44, 0x7a, 0xed, 0xc9, 0x43, 0x4f, 0x9d, 0x4e, 0x3c, 0x7d, 0x0e, 0xff, 0x07, 0x87, + 0xeb, 0xca, 0xca, 0x65, 0x6d, 0xbe, 0xc5, 0x31, 0x8b, 0xcc, 0x7e, 0x0a, 0x71, 0x4a, 0x4d, 0x9d, + 0x3d, 0xfd, 0x7a, 0x56, 0x32, 0x8a, 0x6c, 0x6d, 0x9d, 0x2a, 0xd9, 0x8e, 0x68, 0x89, 0x63, 0xc6, + 0x4f, 0x24, 0xd1, 0x2a, 0x72, 0x69, 0x08, 0x77, 0xa0, 0x7f, 0xfe, 0xc6, 0x33, 0x8d, 0xb4, 0x7d, + 0x73, 0x91, 0x13, 0x9c, 0x47, 0x53, 0x6a, 0x13, 0xdf, 0x19, 0xc7, 0xed, 0x48, 0x81, 0xed, 0xd8, + 0x1f, 0x11, 0x11, 0xbb, 0x41, 0x15, 0x5b, 0xa4, 0xf5, 0xc9, 0x2b, 0x48, 0x5e, 0xd8, 0x4b, 0x52, + 0x1f, 0xf7, 0x87, 0xf2, 0x68, 0x25, 0x28, 0x79, 0xee, 0x39, 0x41, 0xc9, 0x0e, 0xc8, 0xf9, 0xf2, + 0xd8, 0x24, 0x09, 0xb4, 0xd4, 0xb7, 0x90, 0xba, 0x26, 0xe8, 0x1d, 0xb4, 0xd7, 0x09, 0x00, 0xc4, + 0xa0, 0xb6, 0x14, 0xe8, 0x4c, 0x29, 0x60, 0x54, 0x2e, 0x01, 0xde, 0x54, 0x66, 0x40, 0x22, 0x50, + 0x27, 0xf1, 0xe7, 0x62, 0xa9, 0x00, 0x5a, 0x61, 0x2e, 0xfa, 0xfe, 0x16, 0xd8, 0xe0, 0xe7, 0x66, + 0x17, 0xda, 0xb8, 0x0c, 0xa6, 0x04, 0x8d, 0xf8, 0x21, 0x68, 0x39 +}; + +static UCHAR rsaHash[] = +{ + 0x96, 0x1f, 0xa6, 0x49, 0x58, 0x81, 0x8f, 0x76, 0x77, 0x07, 0x07, 0x27, 0x55, 0xd7, 0x01, 0x8d, + 0xcd, 0x27, 0x8e, 0x94 +}; + +static UCHAR rsaSignature[] = +{ + 0xa8, 0x3a, 0x9d, 0xaf, 0x92, 0x94, 0xa4, 0x4d, 0x34, 0xba, 0x41, 0x0c, 0xc1, 0x23, 0x91, 0xc7, + 0x91, 0xa8, 0xf8, 0xfc, 0x94, 0x87, 0x4d, 0x05, 0x85, 0x63, 0xe8, 0x7d, 0xea, 0x7f, 0x6b, 0x8d, + 0xbb, 0x9a, 0xd4, 0x46, 0xa6, 0xc0, 0xd6, 0xdc, 0x91, 0xba, 0xd3, 0x1a, 0xbf, 0xf4, 0x52, 0xa0, + 0xc7, 0x15, 0x87, 0xe9, 0x1e, 0x60, 0x49, 0x9c, 0xee, 0x5a, 0x9c, 0x6c, 0xbd, 0x7a, 0x3e, 0xc3, + 0x48, 0xb3, 0xee, 0xca, 0x68, 0x40, 0x9b, 0xa1, 0x4c, 0x6e, 0x20, 0xd6, 0xca, 0x6c, 0x72, 0xaf, + 0x2b, 0x6b, 0x62, 0x7c, 0x78, 0x06, 0x94, 0x4c, 0x02, 0xf3, 0x8d, 0x49, 0xe0, 0x11, 0xc4, 0x9b, + 0x62, 0x5b, 0xc2, 0xfd, 0x68, 0xf4, 0x07, 0x15, 0x71, 0x11, 0x4c, 0x35, 0x97, 0x5d, 0xc0, 0xe6, + 0x22, 0xc9, 0x8a, 0x7b, 0x96, 0xc9, 0xc3, 0xe4, 0x2b, 0x1e, 0x88, 0x17, 0x4f, 0x98, 0x9b, 0xf3, + 0x42, 0x23, 0x0c, 0xa0, 0xfa, 0x19, 0x03, 0x2a, 0xf7, 0x13, 0x2d, 0x27, 0xac, 0x9f, 0xaf, 0x2d, + 0xa3, 0xce, 0xf7, 0x63, 0xbb, 0x39, 0x9f, 0x72, 0x80, 0xdd, 0x6c, 0x73, 0x00, 0x85, 0x70, 0xf2, + 0xed, 0x50, 0xed, 0xa0, 0x74, 0x42, 0xd7, 0x22, 0x46, 0x24, 0xee, 0x67, 0xdf, 0xb5, 0x45, 0xe8, + 0x49, 0xf4, 0x9c, 0xe4, 0x00, 0x83, 0xf2, 0x27, 0x8e, 0xa2, 0xb1, 0xc3, 0xc2, 0x01, 0xd7, 0x59, + 0x2e, 0x4d, 0xac, 0x49, 0xa2, 0xc1, 0x8d, 0x88, 0x4b, 0xfe, 0x28, 0xe5, 0xac, 0xa6, 0x85, 0xc4, + 0x1f, 0xf8, 0xc5, 0xc5, 0x14, 0x4e, 0xa3, 0xcb, 0x17, 0xb7, 0x64, 0xb3, 0xc2, 0x12, 0xf8, 0xf8, + 0x36, 0x99, 0x1c, 0x91, 0x9b, 0xbd, 0xed, 0x55, 0x0f, 0xfd, 0x49, 0x85, 0xbb, 0x32, 0xad, 0x78, + 0xc1, 0x74, 0xe6, 0x7c, 0x18, 0x0f, 0x2b, 0x3b, 0xaa, 0xd1, 0x9d, 0x40, 0x71, 0x1d, 0x19, 0x53 +}; + +static void test_RSA(void) +{ + BCRYPT_PKCS1_PADDING_INFO pad; + BCRYPT_ALG_HANDLE alg = NULL; + BCRYPT_KEY_HANDLE key = NULL; + NTSTATUS ret; + + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_RSA_ALGORITHM, NULL, 0); + if (ret) + { + win_skip("Failed to open RSA provider: %08x, skipping test\n", ret); + return; + } + + ret = pBCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlob, sizeof(rsaPublicBlob), 0); + ok(!ret, "pBCryptImportKeyPair failed: %08x\n", ret); + + pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; + ret = pBCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); + ok(!ret, "pBCryptVerifySignature failed: %08x\n", ret); + + ret = pBCryptVerifySignature(key, NULL, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", ret); + + pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; + ret = pBCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), 0); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", ret); + + ret = pBCryptVerifySignature(key, NULL, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), 0); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", ret); + + pad.pszAlgId = BCRYPT_AES_ALGORITHM; + ret = pBCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); + ok(ret == STATUS_NOT_SUPPORTED, "Expected STATUS_NOT_SUPPORTED, got %08x\n", ret); + + pad.pszAlgId = NULL; + ret = pBCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); + ok(ret == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %08x\n", ret); + + ret = pBCryptDestroyKey(key); + ok(!ret, "pBCryptDestroyKey failed: %08x\n", ret); + + ret = pBCryptCloseAlgorithmProvider(alg, 0); + ok(!ret, "pBCryptCloseAlgorithmProvider failed: %08x\n", ret); +} + START_TEST(bcrypt) { HMODULE module; @@ -1538,6 +1632,7 @@ START_TEST(bcrypt) test_BCryptDecrypt(); test_key_import_export(); test_ECDSA(); + test_RSA(); if (pBCryptHash) /* >= Win 10 */ test_BcryptHash();

1 0

Andrew Eikum : xaudio2: Prefer builtin version.
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: b747d6f6ccdf1699a9242a570d681fa246de592e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b747d6f6ccdf1699a9242a57… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Mar 26 13:14:20 2018 -0500 xaudio2: Prefer builtin version. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 0682a5f..28cf985 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -89,8 +89,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstDLL; DisableThreadLibraryCalls( hinstDLL );

1 0

Kieran Duggan : atl100/tests: Fix leaked memory during test_AtlAxAttachControl.
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: ecb8d9f55184a85251ef5cb2f6eb9d042245bfde URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecb8d9f55184a85251ef5cb2… Author: Kieran Duggan <KieranDuggan15(a)gmail.com> Date: Mon Mar 26 13:11:09 2018 -0400 atl100/tests: Fix leaked memory during test_AtlAxAttachControl. Signed-off-by: Kieran Duggan <kieranduggan15(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl100/tests/atl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index c6e5cda..eecf079 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -902,6 +902,7 @@ static void test_AtlAxAttachControl(void) hr = AtlAxAttachControl(control, hwnd, &container); ok(hr == S_OK, "Expected AtlAxAttachControl to return S_OK, got 0x%08x\n", hr); ok(container != NULL, "Expected not NULL!\n"); + IUnknown_Release(container); val = GetWindowLongW(hwnd, GWLP_USERDATA); ok(val == 0xdeadbeef, "Expected unchanged, returned %08x\n", val); DestroyWindow(hwnd);

1 0