December 2017 - Wine-Commits

Jacek Caban : bcrypt: Added MD2 hash support.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: wine Branch: master Commit: 85657376b31b61a3f49189b8c5892e602ee8c3da URL: http://source.winehq.org/git/wine.git/?a=commit;h=85657376b31b61a3f49189b8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 7 19:46:20 2017 +0100 bcrypt: Added MD2 hash support. By adopting rsaenh implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/Makefile.in | 1 + dlls/bcrypt/bcrypt_internal.h | 9 +++ dlls/bcrypt/bcrypt_main.c | 16 +++++ dlls/bcrypt/md2.c | 144 ++++++++++++++++++++++++++++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 6 ++ include/bcrypt.h | 1 + 6 files changed, 177 insertions(+) diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in index 602d22d..3d081c8 100644 --- a/dlls/bcrypt/Makefile.in +++ b/dlls/bcrypt/Makefile.in @@ -5,6 +5,7 @@ EXTRAINCL = $(GNUTLS_CFLAGS) C_SRCS = \ bcrypt_main.c \ + md2.c \ sha256.c \ sha512.c diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index b12450f..c58ede8 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -51,6 +51,15 @@ void sha384_init(SHA512_CTX *ctx) DECLSPEC_HIDDEN; #define sha384_update sha512_update void sha384_finalize(SHA512_CTX *ctx, UCHAR *buffer) DECLSPEC_HIDDEN; +typedef struct { + unsigned char chksum[16], X[48], buf[16]; + unsigned long curlen; +} MD2_CTX; + +void md2_init(MD2_CTX *ctx) DECLSPEC_HIDDEN; +void md2_update(MD2_CTX *ctx, const unsigned char *buf, ULONG len) DECLSPEC_HIDDEN; +void md2_finalize(MD2_CTX *ctx, unsigned char *hash) DECLSPEC_HIDDEN; + /* Definitions from advapi32 */ typedef struct { diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index b631128..b202184 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -145,6 +145,7 @@ struct object enum alg_id { ALG_ID_AES, + ALG_ID_MD2, ALG_ID_MD5, ALG_ID_RNG, ALG_ID_SHA1, @@ -163,6 +164,7 @@ static const struct { const WCHAR *alg_name; } alg_props[] = { /* ALG_ID_AES */ { 654, 0, 0, BCRYPT_AES_ALGORITHM }, + /* ALG_ID_MD2 */ { 270, 16, 128, BCRYPT_MD2_ALGORITHM }, /* ALG_ID_MD5 */ { 274, 16, 512, BCRYPT_MD5_ALGORITHM }, /* ALG_ID_RNG */ { 0, 0, 0, BCRYPT_RNG_ALGORITHM }, /* ALG_ID_SHA1 */ { 278, 20, 512, BCRYPT_SHA1_ALGORITHM }, @@ -235,6 +237,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR } if (!strcmpW( id, BCRYPT_AES_ALGORITHM )) alg_id = ALG_ID_AES; + else if (!strcmpW( id, BCRYPT_MD2_ALGORITHM )) alg_id = ALG_ID_MD2; else if (!strcmpW( id, BCRYPT_MD5_ALGORITHM )) alg_id = ALG_ID_MD5; else if (!strcmpW( id, BCRYPT_RNG_ALGORITHM )) alg_id = ALG_ID_RNG; else if (!strcmpW( id, BCRYPT_SHA1_ALGORITHM )) alg_id = ALG_ID_SHA1; @@ -287,6 +290,7 @@ struct hash_impl { union { + MD2_CTX md2; MD5_CTX md5; SHA_CTX sha1; SHA256_CTX sha256; @@ -298,6 +302,10 @@ static NTSTATUS hash_init( struct hash_impl *hash, enum alg_id alg_id ) { switch (alg_id) { + case ALG_ID_MD2: + md2_init( &hash->u.md2 ); + break; + case ALG_ID_MD5: MD5Init( &hash->u.md5 ); break; @@ -330,6 +338,10 @@ static NTSTATUS hash_update( struct hash_impl *hash, enum alg_id alg_id, { switch (alg_id) { + case ALG_ID_MD2: + md2_update( &hash->u.md2, input, size ); + break; + case ALG_ID_MD5: MD5Update( &hash->u.md5, input, size ); break; @@ -362,6 +374,10 @@ static NTSTATUS hash_finish( struct hash_impl *hash, enum alg_id alg_id, { switch (alg_id) { + case ALG_ID_MD2: + md2_finalize( &hash->u.md2, output ); + break; + case ALG_ID_MD5: MD5Final( &hash->u.md5 ); memcpy( output, hash->u.md5.digest, 16 ); diff --git a/dlls/bcrypt/md2.c b/dlls/bcrypt/md2.c new file mode 100644 index 0000000..3ff25da --- /dev/null +++ b/dlls/bcrypt/md2.c @@ -0,0 +1,144 @@ +/* + * MD2 (RFC 1319) hash function implementation by Tom St Denis + * + * Copyright 2004 Michael Jung + * Based on public domain code by Tom St Denis (tomstdenis(a)iahu.ca) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* + * This file contains code from the LibTomCrypt cryptographic + * library written by Tom St Denis (tomstdenis(a)iahu.ca). LibTomCrypt + * is in the public domain. The code in this file is tailored to + * special requirements. Take a look at http://libtomcrypt.org for the + * original version. + */ + +#include <assert.h> +#include "bcrypt_internal.h" + +static const unsigned char PI_SUBST[256] = { + 41, 46, 67, 201, 162, 216, 124, 1, 61, 54, 84, 161, 236, 240, 6, + 19, 98, 167, 5, 243, 192, 199, 115, 140, 152, 147, 43, 217, 188, + 76, 130, 202, 30, 155, 87, 60, 253, 212, 224, 22, 103, 66, 111, 24, + 138, 23, 229, 18, 190, 78, 196, 214, 218, 158, 222, 73, 160, 251, + 245, 142, 187, 47, 238, 122, 169, 104, 121, 145, 21, 178, 7, 63, + 148, 194, 16, 137, 11, 34, 95, 33, 128, 127, 93, 154, 90, 144, 50, + 39, 53, 62, 204, 231, 191, 247, 151, 3, 255, 25, 48, 179, 72, 165, + 181, 209, 215, 94, 146, 42, 172, 86, 170, 198, 79, 184, 56, 210, + 150, 164, 125, 182, 118, 252, 107, 226, 156, 116, 4, 241, 69, 157, + 112, 89, 100, 113, 135, 32, 134, 91, 207, 101, 230, 45, 168, 2, 27, + 96, 37, 173, 174, 176, 185, 246, 28, 70, 97, 105, 52, 64, 126, 15, + 85, 71, 163, 35, 221, 81, 175, 58, 195, 92, 249, 206, 186, 197, + 234, 38, 44, 83, 13, 110, 133, 40, 132, 9, 211, 223, 205, 244, 65, + 129, 77, 82, 106, 220, 55, 200, 108, 193, 171, 250, 36, 225, 123, + 8, 12, 189, 177, 74, 120, 136, 149, 139, 227, 99, 232, 109, 233, + 203, 213, 254, 59, 0, 29, 57, 242, 239, 183, 14, 102, 88, 208, 228, + 166, 119, 114, 248, 235, 117, 75, 10, 49, 68, 80, 180, 143, 237, + 31, 26, 219, 153, 141, 51, 159, 17, 131, 20 +}; + +/* adds 16 bytes to the checksum */ +static void md2_update_chksum(MD2_CTX *md2) +{ + int j; + unsigned char L; + L = md2->chksum[15]; + for (j = 0; j < 16; j++) { + +/* caution, the RFC says its "C[j] = S[M[i*16+j] xor L]" but the reference source code [and test vectors] say + otherwise. +*/ + L = (md2->chksum[j] ^= PI_SUBST[(int)(md2->buf[j] ^ L)] & 255); + } +} + +static void md2_compress(MD2_CTX *md2) +{ + int j, k; + unsigned char t; + + /* copy block */ + for (j = 0; j < 16; j++) { + md2->X[16+j] = md2->buf[j]; + md2->X[32+j] = md2->X[j] ^ md2->X[16+j]; + } + + t = 0; + + /* do 18 rounds */ + for (j = 0; j < 18; j++) { + for (k = 0; k < 48; k++) { + t = (md2->X[k] ^= PI_SUBST[(int)(t & 255)]); + } + t = (t + (unsigned char)j) & 255; + } +} + +void md2_init(MD2_CTX *md2) +{ + /* MD2 uses a zero'ed state... */ + memset(md2->X, 0, sizeof(md2->X)); + memset(md2->chksum, 0, sizeof(md2->chksum)); + memset(md2->buf, 0, sizeof(md2->buf)); + md2->curlen = 0; +} + +void md2_update(MD2_CTX *md2, const unsigned char *buf, ULONG len) +{ + unsigned long n; + + assert(md2->curlen <= sizeof(md2->buf)); + + while (len > 0) { + n = min(len, (16 - md2->curlen)); + memcpy(md2->buf + md2->curlen, buf, (size_t)n); + md2->curlen += n; + buf += n; + len -= n; + + /* is 16 bytes full? */ + if (md2->curlen == 16) { + md2_compress(md2); + md2_update_chksum(md2); + md2->curlen = 0; + } + } +} + +void md2_finalize(MD2_CTX * md2, unsigned char *hash) +{ + unsigned long i, k; + + assert(md2->curlen <= sizeof(md2->buf)); + + /* pad the message */ + k = 16 - md2->curlen; + for (i = md2->curlen; i < 16; i++) { + md2->buf[i] = (unsigned char)k; + } + + /* hash and update */ + md2_compress(md2); + md2_update_chksum(md2); + + /* hash checksum */ + memcpy(md2->buf, md2->chksum, 16); + md2_compress(md2); + + /* output is lower 16 bytes of X */ + memcpy(hash, md2->X, 16); +} diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 524bd08..de04190 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -323,6 +323,12 @@ static void test_hashes(void) "2eecf91373941f9315dd730a77937fa92444450fbece86f409d9cb5ec48c6513" }, { + "MD2", + 16, + "1bb33606ba908912a84221109d29cd7e", + "7f05b0638d77f4a27f3a9c4d353cd648" + }, + { "MD5", 16, "e2a3e68d23ce348b8f68b3079de3d4c9", diff --git a/include/bcrypt.h b/include/bcrypt.h index 2555bf0..70928c5 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -64,6 +64,7 @@ typedef LONG NTSTATUS; {'M','i','c','r','o','s','o','f','t',' ','P','l','a','t','f','o','r','m',' ','C','r','y','p','t','o',' ','P','r','o','v','i','d','e','r',0} #define BCRYPT_AES_ALGORITHM (const WCHAR []){'A','E','S',0} +#define BCRYPT_MD2_ALGORITHM (const WCHAR []){'M','D','2',0} #define BCRYPT_MD5_ALGORITHM (const WCHAR []){'M','D','5',0} #define BCRYPT_RNG_ALGORITHM (const WCHAR []){'R','N','G',0} #define BCRYPT_SHA1_ALGORITHM (const WCHAR []){'S','H','A','1',0}

1 0

Jacek Caban : bcrypt/tests: Use common helper for testing different hash types.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: wine Branch: master Commit: 1d0d1197169514e17992f94dabeff55e5ddb121d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d0d1197169514e17992f94da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 7 19:45:43 2017 +0100 bcrypt/tests: Use common helper for testing different hash types. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 431 ++++++++------------------------------------- 1 file changed, 69 insertions(+), 362 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d0d1197169514e17992f…

1 0

Akihiro Sagawa : ntdll: Return correct time zone names for Asia/ Tokyo and Asia/Yakutsk.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: wine Branch: master Commit: 35d93e02d1a26586f4688d36895668cdeaa04feb URL: http://source.winehq.org/git/wine.git/?a=commit;h=35d93e02d1a26586f4688d368… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Dec 3 23:26:05 2017 +0900 ntdll: Return correct time zone names for Asia/Tokyo and Asia/Yakutsk. Without this change, for Japan, Wine returns "Korea Standard Time", not "Tokyo Standard Time" as seen in Bug 42719. Actually, this is a regression by d666143f880f9e19849f8f2b520dc059a11750d1. The new code relies on offsets from UTC and DST change timings. However, Northeast Asia regions don't use daylight saving time. Thus, Wine can't distinguish between these regions. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/time.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 12dbdc3..e2cd770 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -53,6 +53,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); +#define SHORT_TZ_NAME_MAX 8 +struct tz_name_map { + WCHAR key_name[128]; + char short_name[SHORT_TZ_NAME_MAX]; +}; + static int init_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi); static RTL_CRITICAL_SECTION TIME_tz_section; @@ -571,6 +577,42 @@ static BOOL match_tz_info(const RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, const RT return FALSE; } +static int compare_tz_key(const void *a, const void *b) +{ + const struct tz_name_map *map_a, *map_b; + map_a = (const struct tz_name_map *)a; + map_b = (const struct tz_name_map *)b; + return strcmpW(map_a->key_name, map_b->key_name); +} + +static BOOL match_tz_name(const char* tz_name, + const RTL_DYNAMIC_TIME_ZONE_INFORMATION *reg_tzi) +{ + static const struct tz_name_map mapping[] = { + { {'K','o','r','e','a',' ','S','t','a','n','d','a','r','d',' ','T','i', + 'm','e',0 }, + "KST" }, + { {'T','o','k','y','o',' ','S','t','a','n','d','a','r','d',' ','T','i', + 'm','e',0 }, + "JST" }, + { {'Y','a','k','u','t','s','k',' ','S','t','a','n','d','a','r','d',' ', + 'T','i','m','e',0 }, + "+09" }, /* YAKST was used until tzdata 2016f */ + }; + struct tz_name_map *match, key; + + if (reg_tzi->DaylightDate.wMonth) + return TRUE; + + strcpyW(key.key_name, reg_tzi->TimeZoneKeyName); + match = bsearch(&key, mapping, sizeof(mapping)/sizeof(mapping[0]), + sizeof(mapping[0]), compare_tz_key); + if (!match) + return TRUE; + + return !strcmp(match->short_name, tz_name); +} + static BOOL reg_query_value(HKEY hkey, LPCWSTR name, DWORD type, void *data, DWORD count) { UNICODE_STRING nameW; @@ -592,7 +634,7 @@ static BOOL reg_query_value(HKEY hkey, LPCWSTR name, DWORD type, void *data, DWO return TRUE; } -static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, int year) +static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, const char* tz_name, int year) { static const WCHAR Time_ZonesW[] = { 'M','a','c','h','i','n','e','\\', 'S','o','f','t','w','a','r','e','\\', @@ -714,7 +756,8 @@ static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, int year) NtClose(hSubkey); - if (match_tz_info(tzi, &reg_tzi)) + if (match_tz_info(tzi, &reg_tzi) + && match_tz_name(tz_name, &reg_tzi)) { *tzi = reg_tzi; NtClose(hkey); @@ -729,8 +772,8 @@ static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, int year) NtClose(hkey); FIXME("Can't find matching timezone information in the registry for " - "bias %d, std (d/m/y): %u/%02u/%04u, dlt (d/m/y): %u/%02u/%04u\n", - tzi->Bias, + "%s, bias %d, std (d/m/y): %u/%02u/%04u, dlt (d/m/y): %u/%02u/%04u\n", + tz_name, tzi->Bias, tzi->StandardDate.wDay, tzi->StandardDate.wMonth, tzi->StandardDate.wYear, tzi->DaylightDate.wDay, tzi->DaylightDate.wMonth, tzi->DaylightDate.wYear); } @@ -763,6 +806,7 @@ static int init_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi) static RTL_DYNAMIC_TIME_ZONE_INFORMATION cached_tzi; static int current_year = -1, current_bias = 65535; struct tm *tm; + char tz_name[SHORT_TZ_NAME_MAX]; time_t year_start, year_end, tmp, dlt = 0, std = 0; int is_dst, current_is_dst, bias; @@ -782,6 +826,10 @@ static int init_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi) } memset(tzi, 0, sizeof(*tzi)); + if (!strftime(tz_name, sizeof(tz_name), "%Z", tm)) { + /* not enough room or another error */ + tz_name[0] = '\0'; + } TRACE("tz data will be valid through year %d, bias %d\n", tm->tm_year + 1900, bias); current_year = tm->tm_year; @@ -864,7 +912,7 @@ static int init_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi) tzi->StandardBias); } - find_reg_tz_info(tzi, current_year + 1900); + find_reg_tz_info(tzi, tz_name, current_year + 1900); cached_tzi = *tzi; RtlLeaveCriticalSection( &TIME_tz_section );

1 0

Francois Gouget : testbot/web: Remove some unused escapeHTML() import directives.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: tools Branch: master Commit: 4d2bfb54e860c77723c9081a1522105e0a7389cb URL: http://source.winehq.org/git/tools.git/?a=commit;h=4d2bfb54e860c77723c9081a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 7 04:15:14 2017 +0100 testbot/web: Remove some unused escapeHTML() import directives. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Feedback.pl | 1 - testbot/web/ForgotPassword.pl | 1 - testbot/web/ResetPassword.pl | 1 - 3 files changed, 3 deletions(-) diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index e22dc3a..ded705a 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -21,7 +21,6 @@ use strict; package FeedbackPage; -use CGI qw(:standard escapeHTML); use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; use WineTestBot::Config; diff --git a/testbot/web/ForgotPassword.pl b/testbot/web/ForgotPassword.pl index 801b50d..c6240e7 100644 --- a/testbot/web/ForgotPassword.pl +++ b/testbot/web/ForgotPassword.pl @@ -21,7 +21,6 @@ use strict; package ForgotPasswordPage; -use CGI qw(:standard escapeHTML); use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; use WineTestBot::Users; diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index d512968..431a4da 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -21,7 +21,6 @@ use strict; package ResetPasswordPage; -use CGI qw(:standard escapeHTML); use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; use WineTestBot::Users;

1 0

Francois Gouget : testbot/web: Use our escapeHTML() instead of calling directly the CGI one.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: tools Branch: master Commit: 96e0fdacae01d741bc0144e8f699f5cccbeaff87 URL: http://source.winehq.org/git/tools.git/?a=commit;h=96e0fdacae01d741bc0144e8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 7 04:13:44 2017 +0100 testbot/web: Use our escapeHTML() instead of calling directly the CGI one. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Login.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index 99757c5..f17d60e 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -21,7 +21,6 @@ use strict; package LoginPage; -use CGI qw(:standard escapeHTML); use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; use WineTestBot::Config; @@ -79,7 +78,7 @@ sub GenerateFields($) if (defined($self->GetParam("Target"))) { print "<div><input type='hidden' name='Target' value='", - escapeHTML($self->GetParam("Target")), "'></div>\n"; + $self->escapeHTML($self->GetParam("Target")), "'></div>\n"; } $self->SUPER::GenerateFields();

1 0

Francois Gouget : testbot/web: Add ids so one can link to a given job on the Home page.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: tools Branch: master Commit: 62bfba14f69d3a021e7945f36f653d539b3690eb URL: http://source.winehq.org/git/tools.git/?a=commit;h=62bfba14f69d3a021e7945f3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 7 04:15:03 2017 +0100 testbot/web: Add ids so one can link to a given job on the Home page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 3f3a91e..b0c2d45 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -87,7 +87,8 @@ sub GenerateDataCell($$$$) my $PropertyName = $PropertyDescriptor->GetName(); if ($PropertyName eq "Status") { - print "<td><a href='/JobDetails.pl?Key=", uri_escape($Item->GetKey()), "'>"; + my $EscapedKey = uri_escape($Item->GetKey()); + print "<td id='job$EscapedKey'><a href='/JobDetails.pl?Key=$EscapedKey'>"; my %HTMLChunks = ("queued" => "<span class='queued'>queued</span>", "running" => "<span class='running'>running</span>",

1 0

Francois Gouget : testbot: Document a quirk of Collection::Add().
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: tools Branch: master Commit: 97036c17e646267916d87da7570a420631611d9a URL: http://source.winehq.org/git/tools.git/?a=commit;h=97036c17e646267916d87da7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 7 04:13:09 2017 +0100 testbot: Document a quirk of Collection::Add(). Not only does it not force loading from the database, it marks the Collection as loaded. So if Add() is the first call on a Collection, calling GetKeys() or GetItems() later on will only return the new Item. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Collection.pm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 9d3d3ae..1b29ec1 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -168,6 +168,11 @@ sub Load($) Instantiates a new Item and adds it to the Collection. +Note that not only does calling Add() not force loading from the database, +it marks the Collection as loaded. So if Add() is the first call on a +Collection, calling GetKeys() or GetItems() later on will only return the new +Item. + See Item->new() for details on the Item's default column values and for important information regarding its primary key.

1 0

Francois Gouget : testbot: Don' t fail setting the Status of a brand new VM.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: tools Branch: master Commit: d4fe0e1bf6dece453384768d25e422ff527d375e URL: http://source.winehq.org/git/tools.git/?a=commit;h=d4fe0e1bf6dece453384768d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 7 04:12:52 2017 +0100 testbot: Don't fail setting the Status of a brand new VM. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index b931342..30b6124 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -221,7 +221,7 @@ sub Status($;$) my $CurrentStatus = $self->SUPER::Status; return $CurrentStatus if (!defined $NewStatus); - if ($NewStatus ne $CurrentStatus) + if (!defined $CurrentStatus or $NewStatus ne $CurrentStatus) { $self->SUPER::Status($NewStatus); $self->{OldStatus} = $CurrentStatus;

1 0

Francois Gouget : testbot: Remove extraneous colons in new() calls.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: tools Branch: master Commit: b4b9a015de557b5efeaa4457b40e8daad952614c URL: http://source.winehq.org/git/tools.git/?a=commit;h=b4b9a015de557b5efeaa4457… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 7 04:13:24 2017 +0100 testbot: Remove extraneous colons in new() calls. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Branches.pm | 4 ++-- testbot/lib/WineTestBot/Roles.pm | 4 ++-- testbot/lib/WineTestBot/Users.pm | 4 ++-- testbot/lib/WineTestBot/VMs.pm | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/Branches.pm b/testbot/lib/WineTestBot/Branches.pm index 63a582c..bfd24dd 100644 --- a/testbot/lib/WineTestBot/Branches.pm +++ b/testbot/lib/WineTestBot/Branches.pm @@ -97,8 +97,8 @@ sub CreateItem($) sub CreateBranches(;$) { my ($ScopeObject) = @_; - return WineTestBot::Branches::->new("Branches", "Branches", "Branch", - \@PropertyDescriptors, $ScopeObject); + return WineTestBot::Branches->new("Branches", "Branches", "Branch", + \@PropertyDescriptors, $ScopeObject); } 1; diff --git a/testbot/lib/WineTestBot/Roles.pm b/testbot/lib/WineTestBot/Roles.pm index 86c5a13..7c59e6a 100644 --- a/testbot/lib/WineTestBot/Roles.pm +++ b/testbot/lib/WineTestBot/Roles.pm @@ -73,8 +73,8 @@ sub CreateItem($) sub CreateRoles(;$) { my ($ScopeObject) = @_; - return WineTestBot::Roles::->new("Roles", "Roles", "Role", - \@PropertyDescriptors, $ScopeObject); + return WineTestBot::Roles->new("Roles", "Roles", "Role", + \@PropertyDescriptors, $ScopeObject); } 1; diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 9618a18..2139b6d 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -333,8 +333,8 @@ sub CreateItem($) sub CreateUsers(;$) { my ($ScopeObject) = @_; - return WineTestBot::Users::->new("Users", "Users", "User", - \@PropertyDescriptors, $ScopeObject); + return WineTestBot::Users->new("Users", "Users", "User", + \@PropertyDescriptors, $ScopeObject); } sub AuthenticateLDAP($$$) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 30b6124..7db0aa5 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -553,8 +553,8 @@ sub CreateItem($) sub CreateVMs(;$) { my ($ScopeObject) = @_; - return WineTestBot::VMs::->new("VMs", "VMs", "VM", - \@PropertyDescriptors, $ScopeObject); + return WineTestBot::VMs->new("VMs", "VMs", "VM", + \@PropertyDescriptors, $ScopeObject); } sub SortKeysBySortOrder($$)

1 0

Austin English : maintainers: Move WineHQ URLs to https.
by Alexandre Julliard Dec. 6, 2017

Dec. 6, 2017

Module: wine Branch: master Commit: 83bbeab9b2d0ceac2548d2a9d8e5aefb0d9f5606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83bbeab9b2d0ceac2548d2a9d… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 6 13:51:09 2017 -0600 maintainers: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 2f92151..6845a7a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3,7 +3,7 @@ List of Wine subsection maintainers When submitting patches to Wine, the guidelines at -<http://wiki.winehq.org/SubmittingPatches> should be followed. This file +<https://wiki.winehq.org/SubmittingPatches> should be followed. This file contains a list of maintainers for subsections of Wine. When submitting patches, you may want to CC relevant people from this list. If you have questions about your work in an area of Wine, you may find a list of @@ -317,7 +317,7 @@ F: */ Stable Branch M: Michael Stefaniuc <mstefani(a)winehq.org> -W: http://wiki.winehq.org/StableRules +W: https://wiki.winehq.org/StableRules Staging Branch M: Sebastian Lackner <sebastian(a)fds-team.de>

1 0