winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
March 2018
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
785 discussions
Start a n
N
ew thread
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
0
0
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
0
0
Francois Gouget : testbot/web: Import WineTestBot:: Utils for the statistics page.
by Alexandre Julliard
27 Mar '18
27 Mar '18
Module: tools Branch: master Commit: c9034c6afeee09ec6889998a5a07d6368e7e30e3 URL:
https://source.winehq.org/git/tools.git/?a=commit;h=c9034c6afeee09ec6889998…
Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 27 03:42:51 2018 +0200 testbot/web: Import WineTestBot::Utils for the statistics page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Stats.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 1467407..90f5463 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);
1
0
0
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
0
0
Hua Meng : msvcrt: Implement _atol_l.
by Alexandre Julliard
26 Mar '18
26 Mar '18
Module: wine Branch: master Commit: 2f9dd7f6cbedd58ec551b73acdb873402666d74e URL:
https://source.winehq.org/git/wine.git/?a=commit;h=2f9dd7f6cbedd58ec551b73a…
Author: Hua Meng <161220092(a)smail.nju.edu.cn> Date: Mon Mar 26 21:20:22 2018 +0200 msvcrt: Implement _atol_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 | 17 +++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 26 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 bb9a677..aa2f513 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 @@ -7,7 +7,7 @@ @ cdecl -ret64 _atoi64(str) ucrtbase._atoi64 @ stub _atoi64_l @ cdecl _atoi_l(str ptr) ucrtbase._atoi_l -@ stub _atol_l +@ cdecl _atol_l(str ptr) ucrtbase._atol_l @ cdecl _atoldbl(ptr str) ucrtbase._atoldbl @ stub _atoldbl_l @ cdecl -ret64 _atoll_l(str ptr) ucrtbase._atoll_l diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 11d2351..150f235 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -699,7 +699,7 @@ @ cdecl -ret64 _atoi64(str) ntdll._atoi64 @ stub _atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l -@ stub _atol_l +@ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl @ stub _atoldbl_l @ cdecl _beep(long long) MSVCRT__beep diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 7c4e547..d151480 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1047,7 +1047,7 @@ @ cdecl -ret64 _atoi64(str) ntdll._atoi64 @ stub _atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l -@ stub _atol_l +@ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl @ stub _atoldbl_l @ cdecl _beep(long long) MSVCRT__beep diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 9e3deb2..5b13600 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1037,7 +1037,7 @@ @ cdecl -ret64 _atoi64(str) ntdll._atoi64 @ stub _atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l -@ stub _atol_l +@ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl @ stub _atoldbl_l @ cdecl -ret64 _atoll_l(str ptr) MSVCRT__atoll_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 6a6da4b..c60160d 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1008,7 +1008,7 @@ @ cdecl -ret64 _atoi64(str) msvcr120._atoi64 @ stub _atoi64_l @ cdecl _atoi_l(str ptr) msvcr120._atoi_l -@ stub _atol_l +@ cdecl _atol_l(str ptr) msvcr120._atol_l @ cdecl _atoldbl(ptr str) msvcr120._atoldbl @ stub _atoldbl_l @ cdecl -ret64 _atoll_l(str ptr) msvcr120._atoll_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 0913fc9..4c7177c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -363,7 +363,7 @@ @ cdecl -ret64 _atoi64(str) ntdll._atoi64 @ stub _atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l -@ stub _atol_l +@ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl @ stub _atoldbl_l @ cdecl _beep(long long) MSVCRT__beep diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8287864..da9e0ae 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -347,7 +347,7 @@ @ cdecl -ret64 _atoi64(str) ntdll._atoi64 @ stub _atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l -@ stub _atol_l +@ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl @ stub _atoldbl_l @ cdecl _beep(long long) MSVCRT__beep diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 15d9ffc..5fe9977 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -334,7 +334,7 @@ @ cdecl -ret64 _atoi64(str) ntdll._atoi64 # stub -ret64 _atoi64_l(str ptr) @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l -# stub _atol_l(str ptr) +@ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl # stub _atoldbl_l(ptr str ptr) @ cdecl _beep(long long) MSVCRT__beep diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index d70f235..50c146f 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1068,6 +1068,23 @@ int CDECL MSVCRT_atoi(const char *str) } #endif +/****************************************************************** + * _atol_l (MSVCRT.@) + */ +MSVCRT_long CDECL MSVCRT__atol_l(const char *str, MSVCRT__locale_t locale) +{ + __int64 ret = MSVCRT_strtoi64_l(str, NULL, 10, locale); + + if(ret > LONG_MAX) { + ret = LONG_MAX; + *MSVCRT__errno() = MSVCRT_ERANGE; + } else if(ret < LONG_MIN) { + ret = LONG_MIN; + *MSVCRT__errno() = MSVCRT_ERANGE; + } + return ret; +} + #if _MSVCR_VER>=120 /****************************************************************** diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index ff33d86..63d040f 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -198,7 +198,7 @@ @ cdecl -ret64 _atoi64(str) ntdll._atoi64 @ stub _atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l -@ stub _atol_l +@ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl @ stub _atoldbl_l @ cdecl -ret64 _atoll_l(str ptr) MSVCRT__atoll_l
1
0
0
0
Stefan Leichter : advapi32: Silence the fixme in EventActivityIdControl.
by Alexandre Julliard
26 Mar '18
26 Mar '18
Module: wine Branch: master Commit: bae48da7c5e16ec5b1a6e3db48e2eaaec7515db8 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=bae48da7c5e16ec5b1a6e3db…
Author: Stefan Leichter <sle85276(a)gmx.de> Date: Sun Mar 25 10:29:39 2018 +0200 advapi32: Silence the fixme in EventActivityIdControl. Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/eventlog.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 34a21c8..fbab8e8 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -830,7 +830,9 @@ BOOLEAN WINAPI EventProviderEnabled( REGHANDLE handle, UCHAR level, ULONGLONG ke */ ULONG WINAPI EventActivityIdControl(ULONG code, GUID *guid) { - FIXME("0x%x, %p: stub\n", code, guid); + static int once; + + if (!once++) FIXME("0x%x, %p: stub\n", code, guid); return ERROR_SUCCESS; }
1
0
0
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
0
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
0
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
0
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
0
0
← Newer
1
...
10
11
12
13
14
15
16
...
79
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
Results per page:
10
25
50
100
200